diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:41:52 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:41:52 -0200 |
| commit | 154d4bd2331d957d5fa42d52b405e62796570e32 (patch) | |
| tree | 3922b7f3903587a157d990fec257ee84e93ff061 /linux/drivers/media/video/em28xx/em28xx-core.c | |
| parent | 5e3f9df63f1943764da608d50af29912c0b8f0f1 (diff) | |
| parent | 6af1615ac94a5752ea7bf0b3e02ebe2030a32f0e (diff) | |
| download | mediapointer-dvb-s2-154d4bd2331d957d5fa42d52b405e62796570e32.tar.gz mediapointer-dvb-s2-154d4bd2331d957d5fa42d52b405e62796570e32.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/em28xx/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-core.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index 5cf99aaf7..15d86bc97 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/drivers/media/video/em28xx/em28xx-core.c @@ -869,8 +869,11 @@ void em28xx_uninit_isoc(struct em28xx *dev) for (i = 0; i < dev->isoc_ctl.num_bufs; i++) { urb = dev->isoc_ctl.urb[i]; if (urb) { - usb_kill_urb(urb); - usb_unlink_urb(urb); + if (!irqs_disabled()) + usb_kill_urb(urb); + else + usb_unlink_urb(urb); + if (dev->isoc_ctl.transfer_buffer[i]) { usb_buffer_free(dev->udev, urb->transfer_buffer_length, |