aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/cpia1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/cpia1.c')
-rw-r--r--drivers/media/video/gspca/cpia1.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 9b121681d135..c1ae05f4661f 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -37,7 +37,7 @@ MODULE_LICENSE("GPL");
37/* constant value's */ 37/* constant value's */
38#define MAGIC_0 0x19 38#define MAGIC_0 0x19
39#define MAGIC_1 0x68 39#define MAGIC_1 0x68
40#define DATA_IN 0xC0 40#define DATA_IN 0xc0
41#define DATA_OUT 0x40 41#define DATA_OUT 0x40
42#define VIDEOSIZE_QCIF 0 /* 176x144 */ 42#define VIDEOSIZE_QCIF 0 /* 176x144 */
43#define VIDEOSIZE_CIF 1 /* 352x288 */ 43#define VIDEOSIZE_CIF 1 /* 352x288 */
@@ -660,9 +660,9 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command,
660 if (sd->params.qx3.button) { 660 if (sd->params.qx3.button) {
661 /* button pressed - unlock the latch */ 661 /* button pressed - unlock the latch */
662 do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 662 do_command(gspca_dev, CPIA_COMMAND_WriteMCPort,
663 3, 0xDF, 0xDF, 0); 663 3, 0xdf, 0xdf, 0);
664 do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 664 do_command(gspca_dev, CPIA_COMMAND_WriteMCPort,
665 3, 0xFF, 0xFF, 0); 665 3, 0xff, 0xff, 0);
666 } 666 }
667 667
668 /* test whether microscope is cradled */ 668 /* test whether microscope is cradled */
@@ -829,7 +829,7 @@ static int goto_low_power(struct gspca_dev *gspca_dev)
829 if (ret) 829 if (ret)
830 return ret; 830 return ret;
831 831
832 do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0); 832 ret = do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
833 if (ret) 833 if (ret)
834 return ret; 834 return ret;
835 835
@@ -1110,12 +1110,12 @@ static int command_setlights(struct gspca_dev *gspca_dev)
1110 p2 = (sd->params.qx3.toplight == 0) << 3; 1110 p2 = (sd->params.qx3.toplight == 0) << 3;
1111 1111
1112 ret = do_command(gspca_dev, CPIA_COMMAND_WriteVCReg, 1112 ret = do_command(gspca_dev, CPIA_COMMAND_WriteVCReg,
1113 0x90, 0x8F, 0x50, 0); 1113 0x90, 0x8f, 0x50, 0);
1114 if (ret) 1114 if (ret)
1115 return ret; 1115 return ret;
1116 1116
1117 return do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 2, 0, 1117 return do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 2, 0,
1118 p1 | p2 | 0xE0, 0); 1118 p1 | p2 | 0xe0, 0);
1119} 1119}
1120 1120
1121static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply) 1121static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply)