diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 06:00:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 07:55:19 -0400 |
commit | 04ae4cf2cb0c5963b0ea6554f573705c37172313 (patch) | |
tree | 2293ad219a4bb9c8d56768c0081cd5582cfa360f /drivers/media/usb | |
parent | ead5bc4e0bd94e4540bea60b782e2acdb345b803 (diff) |
[media] cx231xx: 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>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-video.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 54cdd4dc455e..990626101718 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c | |||
@@ -1272,36 +1272,43 @@ int cx231xx_g_register(struct file *file, void *priv, | |||
1272 | (u16)reg->reg, value, 4); | 1272 | (u16)reg->reg, value, 4); |
1273 | reg->val = value[0] | value[1] << 8 | | 1273 | reg->val = value[0] | value[1] << 8 | |
1274 | value[2] << 16 | value[3] << 24; | 1274 | value[2] << 16 | value[3] << 24; |
1275 | reg->size = 4; | ||
1275 | break; | 1276 | break; |
1276 | case 1: /* AFE - read byte */ | 1277 | case 1: /* AFE - read byte */ |
1277 | ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS, | 1278 | ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS, |
1278 | (u16)reg->reg, 2, &data, 1); | 1279 | (u16)reg->reg, 2, &data, 1); |
1279 | reg->val = data; | 1280 | reg->val = data; |
1281 | reg->size = 1; | ||
1280 | break; | 1282 | break; |
1281 | case 2: /* Video Block - read byte */ | 1283 | case 2: /* Video Block - read byte */ |
1282 | ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS, | 1284 | ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS, |
1283 | (u16)reg->reg, 2, &data, 1); | 1285 | (u16)reg->reg, 2, &data, 1); |
1284 | reg->val = data; | 1286 | reg->val = data; |
1287 | reg->size = 1; | ||
1285 | break; | 1288 | break; |
1286 | case 3: /* I2S block - read byte */ | 1289 | case 3: /* I2S block - read byte */ |
1287 | ret = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS, | 1290 | ret = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS, |
1288 | (u16)reg->reg, 1, &data, 1); | 1291 | (u16)reg->reg, 1, &data, 1); |
1289 | reg->val = data; | 1292 | reg->val = data; |
1293 | reg->size = 1; | ||
1290 | break; | 1294 | break; |
1291 | case 4: /* AFE - read dword */ | 1295 | case 4: /* AFE - read dword */ |
1292 | ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS, | 1296 | ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS, |
1293 | (u16)reg->reg, 2, &data, 4); | 1297 | (u16)reg->reg, 2, &data, 4); |
1294 | reg->val = data; | 1298 | reg->val = data; |
1299 | reg->size = 4; | ||
1295 | break; | 1300 | break; |
1296 | case 5: /* Video Block - read dword */ | 1301 | case 5: /* Video Block - read dword */ |
1297 | ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS, | 1302 | ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS, |
1298 | (u16)reg->reg, 2, &data, 4); | 1303 | (u16)reg->reg, 2, &data, 4); |
1299 | reg->val = data; | 1304 | reg->val = data; |
1305 | reg->size = 4; | ||
1300 | break; | 1306 | break; |
1301 | case 6: /* I2S Block - read dword */ | 1307 | case 6: /* I2S Block - read dword */ |
1302 | ret = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS, | 1308 | ret = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS, |
1303 | (u16)reg->reg, 1, &data, 4); | 1309 | (u16)reg->reg, 1, &data, 4); |
1304 | reg->val = data; | 1310 | reg->val = data; |
1311 | reg->size = 4; | ||
1305 | break; | 1312 | break; |
1306 | default: | 1313 | default: |
1307 | return -EINVAL; | 1314 | return -EINVAL; |