1 files changed, 7 insertions, 14 deletions

diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 204bb3af4559..706f96f92654 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -323,10 +323,9 @@ static const __u8 initOv6650[] = {
         0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b,
         0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07
 };
-static const __u8 ov6650_sensor_init[][8] =
-{
+static const __u8 ov6650_sensor_init[][8] = {
         /* Bright, contrast, etc are set through SCBB interface.
-         * AVCAP on win2 do not send any data on this   controls. */
+         * AVCAP on win2 do not send any data on this controls. */
         /* Anyway, some registers appears to alter bright and constrat */
 
         /* Reset sensor */
@@ -544,7 +543,7 @@ static const __u8 initTas5130[] = {
         0x18, 0x10, 0x04, 0x03, 0x11, 0x0c
 };
 static const __u8 tas5130_sensor_init[][8] = {
-/*      {0x30, 0x11, 0x00, 0x40, 0x47, 0x00, 0x00, 0x10},
+/*      {0x30, 0x11, 0x00, 0x40, 0x47, 0x00, 0x00, 0x10},
                                         * shutter 0x47 short exposure? */
         {0x30, 0x11, 0x00, 0x40, 0x01, 0x00, 0x00, 0x10},
                                         /* shutter 0x01 long exposure */
@@ -861,7 +860,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 i2c[4] |= reg11 - 1;
 
                 /* If register 11 didn't change, don't change it */
-                if (sd->reg11 == reg11 )
+                if (sd->reg11 == reg11)
                         i2c[0] = 0xa0;
 
                 if (i2c_w(gspca_dev, i2c) == 0)
@@ -1388,7 +1387,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
         return -EINVAL;
 }
 
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
 static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
                         u8 *data,               /* interrupt packet data */
                         int len)                /* interrupt packet length */
@@ -1419,7 +1418,7 @@ static const struct sd_desc sd_desc = {
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
         .dq_callback = do_autogain,
-#ifdef CONFIG_INPUT
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
         .int_pkt_scan = sd_int_pkt_scan,
 #endif
 };
@@ -1479,17 +1478,11 @@ static struct usb_driver sd_driver = {
 /* -- module insert / remove -- */
 static int __init sd_mod_init(void)
 {
-        int ret;
-        ret = usb_register(&sd_driver);
-        if (ret < 0)
-                return ret;
-        PDEBUG(D_PROBE, "registered");
-        return 0;
+        return usb_register(&sd_driver);
 }
 static void __exit sd_mod_exit(void)
 {
         usb_deregister(&sd_driver);
-        PDEBUG(D_PROBE, "deregistered");
 }
 
 module_init(sd_mod_init);