diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-29 07:19:06 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-29 07:19:06 -0300 |
commit | 8178f50745e3f58d2de7196874a86077e51e2d0a (patch) | |
tree | b33ea445532b46c0153289b134661c6ca5adc98c /linux/drivers/media/video/em28xx/em28xx-video.c | |
parent | 94e2f24ecce195fb81e8da1e809e3537f58dce6a (diff) | |
parent | 1aaedcfcedc4290350ffe058a6f1e7af9319ff3c (diff) | |
download | mediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.gz mediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index a10ca0f0d..f4479aeca 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -1667,6 +1667,8 @@ static void em28xx_release_resources(struct em28xx *dev) dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN, dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN); list_del(&dev->devlist); + if (dev->sbutton_input_dev) + em28xx_deregister_snapshot_button(dev); if (dev->radio_dev) { if (-1 != dev->radio_dev->minor) video_unregister_device(dev->radio_dev); |