From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 2 Oct 2007 21:40:46 +0000 (-0700)
Subject: USB: fix gregkh-usb-usb-sisusb2vga-convert-printk-to-dev_-macros
X-Git-Tag: v2.6.24-rc1~1395^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dcfbd97a695a3c28a867501127fa35ac49bc805;p=linux-2.6

USB: fix gregkh-usb-usb-sisusb2vga-convert-printk-to-dev_-macros

drivers/usb/misc/sisusbvga/sisusb.c: In function 'sisusb_open':
drivers/usb/misc/sisusbvga/sisusb.c:2444: warning: 'sisusb' is used uninitialized in this function

I can tell that'll oops just by looking at it.

How come this code assume a 7,000 column xterm? :(

Cc: Felipe Balbi <felipe.lima@indt.org.br>
Cc: Thomas <thomas@winischhofer.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 033bdfe9b2..0790829a57 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3323,15 +3323,7 @@ static int __init usb_sisusb_init(void)
 	sisusb_init_concode();
 #endif
 
-	if (!(retval = usb_register(&sisusb_driver))) {
-
-		dev_info(&sisusb->sisusb_dev->dev, "Driver version %d.%d.%d\n", SISUSB_VERSION,
-				SISUSB_REVISION, SISUSB_PATCHLEVEL);
-		dev_info(&sisusb->sisusb_dev->dev, "sisusb: Copyright (C) 2005 Thomas Winischhofer\n");
-
-	}
-
-	return retval;
+	return usb_register(&sisusb_driver);
 }
 
 static void __exit usb_sisusb_exit(void)