Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / gspca / cpia1.c

diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 9b121681d135e04d2a921fa7d74f304aad01d0a1..4bf2cab98d64cd2a4c38a8f77de2ffb57f1decf5 100644 (file)
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -37,7 +37,7 @@ MODULE_LICENSE("GPL");
 /* constant value's */
 #define MAGIC_0                0x19
 #define MAGIC_1                0x68
-#define DATA_IN                0xC0
+#define DATA_IN                0xc0
 #define DATA_OUT       0x40
 #define VIDEOSIZE_QCIF 0       /* 176x144 */
 #define VIDEOSIZE_CIF  1       /* 352x288 */
@@ -660,9 +660,9 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command,
                if (sd->params.qx3.button) {
                        /* button pressed - unlock the latch */
                        do_command(gspca_dev, CPIA_COMMAND_WriteMCPort,
-                                  3, 0xDF, 0xDF, 0);
+                                  3, 0xdf, 0xdf, 0);
                        do_command(gspca_dev, CPIA_COMMAND_WriteMCPort,
-                                  3, 0xFF, 0xFF, 0);
+                                  3, 0xff, 0xff, 0);
                }
 
                /* test whether microscope is cradled */
@@ -829,7 +829,7 @@ static int goto_low_power(struct gspca_dev *gspca_dev)
        if (ret)
                return ret;
 
-       do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
+       ret = do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
        if (ret)
                return ret;
 
@@ -1110,12 +1110,12 @@ static int command_setlights(struct gspca_dev *gspca_dev)
        p2 = (sd->params.qx3.toplight == 0) << 3;
 
        ret = do_command(gspca_dev, CPIA_COMMAND_WriteVCReg,
-                        0x90, 0x8F, 0x50, 0);
+                        0x90, 0x8f, 0x50, 0);
        if (ret)
                return ret;
 
        return do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 2, 0,
-                         p1 | p2 | 0xE0, 0);
+                         p1 | p2 | 0xe0, 0);
 }
 
 static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply)
@@ -2088,7 +2088,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0553, 0x0002)},
        {USB_DEVICE(0x0813, 0x0001)},
        {}