diff options
| author | Stefan Ringel <linuxtv@stefanringel.de> | 2011-11-28 15:46:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-28 21:30:28 -0200 |
| commit | 8159c184cf58ac78fc868d776fa2062d1162b6e5 (patch) | |
| tree | 0535ca72ce61b2d8611030c690910204a4d63634 /drivers/media/video/tm6000/tm6000-video.c | |
| parent | c00ecc97bc638919ff35117290b4fab01354e8d7 (diff) | |
[media] tm6000: bugfix at interrupt reset
Signed-off-by: Stefan Ringel <linuxtv@stefanringel.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tm6000/tm6000-video.c')
| -rw-r--r-- | drivers/media/video/tm6000/tm6000-video.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c index 1e5ace0b5d1..4db3535a6b4 100644 --- a/drivers/media/video/tm6000/tm6000-video.c +++ b/drivers/media/video/tm6000/tm6000-video.c @@ -1609,12 +1609,25 @@ static int tm6000_release(struct file *file) tm6000_uninit_isoc(dev); + /* Stop interrupt USB pipe */ + tm6000_ir_int_stop(dev); + + usb_reset_configuration(dev->udev); + + if (&dev->int_in) + usb_set_interface(dev->udev, + dev->isoc_in.bInterfaceNumber, + 2); + else + usb_set_interface(dev->udev, + dev->isoc_in.bInterfaceNumber, + 0); + + /* Start interrupt USB pipe */ + tm6000_ir_int_start(dev); + if (!fh->radio) videobuf_mmap_free(&fh->vb_vidq); - - err = tm6000_reset(dev); - if (err < 0) - dev_err(&vdev->dev, "reset failed: %d\n", err); } kfree(fh); |