diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 08:57:31 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 08:57:31 -0200 |
| commit | 0c10299d80fe45160d3c79fd58634ae3b1c025db (patch) | |
| tree | acc45ce055f216abafdb9a9596b8403612deb3fe /linux/drivers/media/video/usbvision/usbvision-video.c | |
| parent | 77e1106a1a76a4b429b21841bd1361f0e8fd5652 (diff) | |
| parent | 2be3674b75c83865e9a131c6c54aaee005df47ed (diff) | |
| download | mediapointer-dvb-s2-0c10299d80fe45160d3c79fd58634ae3b1c025db.tar.gz mediapointer-dvb-s2-0c10299d80fe45160d3c79fd58634ae3b1c025db.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/dvb-api
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index a1e6b2594..89aedd783 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -561,7 +561,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, struct v4l2_register *reg = arg; int errCode; - if (reg->i2c_id != 0) + if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; @@ -580,7 +580,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, PDEBUG(DBG_IOCTL, "VIDIOC_DBG_%c_REGISTER reg=0x%02X, value=0x%02X", cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S', - (unsigned int)reg->reg, reg->val); + (unsigned int)reg->reg, (unsigned int)reg->val); return 0; } #endif |