aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 06:00:05 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:55:34 -0400
commitf82fadcfecb5d4aff0711d63fd321f7fabb0f2fa (patch)
tree54488f8d5d9f3982dedd7a2cce19402a5e6c6fa7
parent04ae4cf2cb0c5963b0ea6554f573705c37172313 (diff)
[media] sn9c20x: the reg->size field wasn't filled in
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/gspca/sn9c20x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index 23b71f9f5942..f4453d52801b 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -1557,6 +1557,7 @@ static int sd_dbg_g_register(struct gspca_dev *gspca_dev,
1557{ 1557{
1558 struct sd *sd = (struct sd *) gspca_dev; 1558 struct sd *sd = (struct sd *) gspca_dev;
1559 1559
1560 reg->size = 1;
1560 switch (reg->match.addr) { 1561 switch (reg->match.addr) {
1561 case 0: 1562 case 0:
1562 if (reg->reg < 0x1000 || reg->reg > 0x11ff) 1563 if (reg->reg < 0x1000 || reg->reg > 0x11ff)
@@ -1568,6 +1569,7 @@ static int sd_dbg_g_register(struct gspca_dev *gspca_dev,
1568 if (sd->sensor >= SENSOR_MT9V011 && 1569 if (sd->sensor >= SENSOR_MT9V011 &&
1569 sd->sensor <= SENSOR_MT9M112) { 1570 sd->sensor <= SENSOR_MT9M112) {
1570 i2c_r2(gspca_dev, reg->reg, (u16 *) &reg->val); 1571 i2c_r2(gspca_dev, reg->reg, (u16 *) &reg->val);
1572 reg->size = 2;
1571 } else { 1573 } else {
1572 i2c_r1(gspca_dev, reg->reg, (u8 *) &reg->val); 1574 i2c_r1(gspca_dev, reg->reg, (u8 *) &reg->val);
1573 } 1575 }