aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/w996Xcf.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/w996Xcf.c')
-rw-r--r--drivers/media/video/gspca/w996Xcf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/video/gspca/w996Xcf.c
index 38a68591ce48..4066ac8c45a0 100644
--- a/drivers/media/video/gspca/w996Xcf.c
+++ b/drivers/media/video/gspca/w996Xcf.c
@@ -67,7 +67,7 @@ static int reg_w(struct sd *sd, __u16 index, __u16 value);
67 --------------------------------------------------------------------------*/ 67 --------------------------------------------------------------------------*/
68static int w9968cf_write_fsb(struct sd *sd, u16* data) 68static int w9968cf_write_fsb(struct sd *sd, u16* data)
69{ 69{
70 struct usb_device* udev = sd->gspca_dev.dev; 70 struct usb_device *udev = sd->gspca_dev.dev;
71 u16 value; 71 u16 value;
72 int ret; 72 int ret;
73 73
@@ -78,7 +78,7 @@ static int w9968cf_write_fsb(struct sd *sd, u16* data)
78 USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE, 78 USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
79 value, 0x06, sd->gspca_dev.usb_buf, 6, 500); 79 value, 0x06, sd->gspca_dev.usb_buf, 6, 500);
80 if (ret < 0) { 80 if (ret < 0) {
81 PDEBUG(D_ERR, "Write FSB registers failed (%d)", ret); 81 err("Write FSB registers failed (%d)", ret);
82 return ret; 82 return ret;
83 } 83 }
84 84
@@ -104,7 +104,7 @@ static int w9968cf_write_sb(struct sd *sd, u16 value)
104 udelay(W9968CF_I2C_BUS_DELAY); 104 udelay(W9968CF_I2C_BUS_DELAY);
105 105
106 if (ret < 0) { 106 if (ret < 0) {
107 PDEBUG(D_ERR, "Write SB reg [01] %04x failed", value); 107 err("Write SB reg [01] %04x failed", value);
108 return ret; 108 return ret;
109 } 109 }
110 110
@@ -130,7 +130,7 @@ static int w9968cf_read_sb(struct sd *sd)
130 ret = sd->gspca_dev.usb_buf[0] | 130 ret = sd->gspca_dev.usb_buf[0] |
131 (sd->gspca_dev.usb_buf[1] << 8); 131 (sd->gspca_dev.usb_buf[1] << 8);
132 else 132 else
133 PDEBUG(D_ERR, "Read SB reg [01] failed"); 133 err("Read SB reg [01] failed");
134 134
135 udelay(W9968CF_I2C_BUS_DELAY); 135 udelay(W9968CF_I2C_BUS_DELAY);
136 136
@@ -437,7 +437,7 @@ static int w9968cf_set_crop_window(struct sd *sd)
437 if (sd->sensor == SEN_OV7620) { 437 if (sd->sensor == SEN_OV7620) {
438 /* Sigh, this is dependend on the clock / framerate changes 438 /* Sigh, this is dependend on the clock / framerate changes
439 made by the frequency control, sick. */ 439 made by the frequency control, sick. */
440 if (sd->freq == 1) { 440 if (sd->ctrls[FREQ].val == 1) {
441 start_cropx = 277; 441 start_cropx = 277;
442 start_cropy = 37; 442 start_cropy = 37;
443 } else { 443 } else {