aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/vc032x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/gspca/vc032x.c')
-rw-r--r--drivers/media/usb/gspca/vc032x.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/usb/gspca/vc032x.c b/drivers/media/usb/gspca/vc032x.c
index e50079503d96..c00ac57de510 100644
--- a/drivers/media/usb/gspca/vc032x.c
+++ b/drivers/media/usb/gspca/vc032x.c
@@ -2927,7 +2927,6 @@ static void reg_r(struct gspca_dev *gspca_dev,
2927 u16 len) 2927 u16 len)
2928{ 2928{
2929 reg_r_i(gspca_dev, req, index, len); 2929 reg_r_i(gspca_dev, req, index, len);
2930#ifdef GSPCA_DEBUG
2931 if (gspca_dev->usb_err < 0) 2930 if (gspca_dev->usb_err < 0)
2932 return; 2931 return;
2933 if (len == 1) 2932 if (len == 1)
@@ -2936,7 +2935,6 @@ static void reg_r(struct gspca_dev *gspca_dev,
2936 else 2935 else
2937 PDEBUG(D_USBI, "GET %02x 0001 %04x %*ph", 2936 PDEBUG(D_USBI, "GET %02x 0001 %04x %*ph",
2938 req, index, 3, gspca_dev->usb_buf); 2937 req, index, 3, gspca_dev->usb_buf);
2939#endif
2940} 2938}
2941 2939
2942static void reg_w_i(struct gspca_dev *gspca_dev, 2940static void reg_w_i(struct gspca_dev *gspca_dev,
@@ -2964,11 +2962,9 @@ static void reg_w(struct gspca_dev *gspca_dev,
2964 u16 value, 2962 u16 value,
2965 u16 index) 2963 u16 index)
2966{ 2964{
2967#ifdef GSPCA_DEBUG
2968 if (gspca_dev->usb_err < 0) 2965 if (gspca_dev->usb_err < 0)
2969 return; 2966 return;
2970 PDEBUG(D_USBO, "SET %02x %04x %04x", req, value, index); 2967 PDEBUG(D_USBO, "SET %02x %04x %04x", req, value, index);
2971#endif
2972 reg_w_i(gspca_dev, req, value, index); 2968 reg_w_i(gspca_dev, req, value, index);
2973} 2969}
2974 2970
@@ -3044,8 +3040,7 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
3044 if (value == 0 && ptsensor_info->IdAdd == 0x82) 3040 if (value == 0 && ptsensor_info->IdAdd == 0x82)
3045 value = read_sensor_register(gspca_dev, 0x83); 3041 value = read_sensor_register(gspca_dev, 0x83);
3046 if (value != 0) { 3042 if (value != 0) {
3047 PDEBUG(D_ERR|D_PROBE, "Sensor ID %04x (%d)", 3043 PDEBUG(D_PROBE, "Sensor ID %04x (%d)", value, i);
3048 value, i);
3049 if (value == ptsensor_info->VpId) 3044 if (value == ptsensor_info->VpId)
3050 return ptsensor_info->sensorId; 3045 return ptsensor_info->sensorId;
3051 3046
@@ -3069,14 +3064,12 @@ static void i2c_write(struct gspca_dev *gspca_dev,
3069{ 3064{
3070 int retry; 3065 int retry;
3071 3066
3072#ifdef GSPCA_DEBUG
3073 if (gspca_dev->usb_err < 0) 3067 if (gspca_dev->usb_err < 0)
3074 return; 3068 return;
3075 if (size == 1) 3069 if (size == 1)
3076 PDEBUG(D_USBO, "i2c_w %02x %02x", reg, *val); 3070 PDEBUG(D_USBO, "i2c_w %02x %02x", reg, *val);
3077 else 3071 else
3078 PDEBUG(D_USBO, "i2c_w %02x %02x%02x", reg, *val, val[1]); 3072 PDEBUG(D_USBO, "i2c_w %02x %02x%02x", reg, *val, val[1]);
3079#endif
3080 reg_r_i(gspca_dev, 0xa1, 0xb33f, 1); 3073 reg_r_i(gspca_dev, 0xa1, 0xb33f, 1);
3081/*fixme:should check if (!(gspca_dev->usb_buf[0] & 0x02)) error*/ 3074/*fixme:should check if (!(gspca_dev->usb_buf[0] & 0x02)) error*/
3082 reg_w_i(gspca_dev, 0xa0, size, 0xb334); 3075 reg_w_i(gspca_dev, 0xa0, size, 0xb334);