diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:46:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:46:23 -0200 |
| commit | dd4ed80e157d22985ed9b47367e62a11c3dd4edd (patch) | |
| tree | 4e4b345904154b82f0157ae187ad68ba2c357bd3 /linux/drivers/media | |
| parent | 414f605809c641ec2e56f89f52aa05b7c8e67fa0 (diff) | |
| parent | 558adc2e28817864b92af93cf1b662a86a347e39 (diff) | |
| download | mediapointer-dvb-s2-dd4ed80e157d22985ed9b47367e62a11c3dd4edd.tar.gz mediapointer-dvb-s2-dd4ed80e157d22985ed9b47367e62a11c3dd4edd.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7134
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-subdev.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index b712c29e7..05bba3928 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -953,8 +953,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev, itv->instance = atomic_inc_return(&ivtv_instance) - 1; retval = v4l2_device_register(&dev->dev, &itv->device); - if (retval) + if (retval) { + kfree(itv); return retval; + } /* "ivtv + PCI ID" is a bit of a mouthful, so use "ivtv + instance" instead. */ snprintf(itv->device.name, sizeof(itv->device.name), diff --git a/linux/drivers/media/video/v4l2-subdev.c b/linux/drivers/media/video/v4l2-subdev.c index fbe9cc0d4..55a2e329a 100644 --- a/linux/drivers/media/video/v4l2-subdev.c +++ b/linux/drivers/media/video/v4l2-subdev.c @@ -33,6 +33,12 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) return v4l2_subdev_call(sd, core, g_ctrl, arg); case VIDIOC_S_CTRL: return v4l2_subdev_call(sd, core, s_ctrl, arg); + case VIDIOC_G_EXT_CTRLS: + return v4l2_subdev_call(sd, core, g_ext_ctrls, arg); + case VIDIOC_S_EXT_CTRLS: + return v4l2_subdev_call(sd, core, s_ext_ctrls, arg); + case VIDIOC_TRY_EXT_CTRLS: + return v4l2_subdev_call(sd, core, try_ext_ctrls, arg); case VIDIOC_QUERYMENU: return v4l2_subdev_call(sd, core, queryctrl, arg); case VIDIOC_LOG_STATUS: |