From: Nikanth Karthikesan <nikanth@google.com>
Date: Fri, 10 Jun 2011 08:57:04 +0000 (+0530)
Subject: viafbdev: fix compilation warning for unused variable
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0acd33d08988cef238619f99ba056be16aab443e;p=deliverable%2Flinux.git

viafbdev: fix compilation warning for unused variable

viafbdev: Fix compilation warning for unused variable for #ifdef MODULE
Fix compilation warning when #ifdef MODULE

drivers/video/via/viafbdev.c: In function ‘viafb_init’:
drivers/video/via/viafbdev.c:2019: warning: unused variable ‘r’

Signed-off-by: Nikanth Karthikesan <nikanth@google.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index cf43c80d27f6..53aa4430d86e 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2016,7 +2016,7 @@ static int __init viafb_setup(void)
 int __init viafb_init(void)
 {
 	u32 dummy_x, dummy_y;
-	int r;
+	int r = 0;
 
 	if (machine_is_olpc())
 		/* Apply XO-1.5-specific configuration. */
@@ -2039,7 +2039,7 @@ int __init viafb_init(void)
 	printk(KERN_INFO
        "VIA Graphics Integration Chipset framebuffer %d.%d initializing\n",
 	       VERSION_MAJOR, VERSION_MINOR);
-	return 0;
+	return r;
 }
 
 void __exit viafb_exit(void)