diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-01-17 11:41:54 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 05:39:40 -0500 |
commit | 8760e5b6d1dc9527e0f96f80daaa12a8158d9839 (patch) | |
tree | 5e950b43b3af4cc84c24a3763443c4485ccd6489 /drivers/media/video | |
parent | 6e7b9ea0937eeb75fa166ef7bd22b5f3bb5676d1 (diff) |
V4L/DVB (10261): em28xx: fix kernel panic on audio shutdown
Revert a change made in change 9743 which resulted in a kernel panic in some
cases on shutdown of the audio stream.
First discovered when working on the Pinnacle 880e support, and later
reproduced by a user on the mailing list with the HVR-900 as well.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index 4df6d3288424..fcc300c93995 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c | |||
@@ -62,7 +62,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev) | |||
62 | 62 | ||
63 | dprintk("Stopping isoc\n"); | 63 | dprintk("Stopping isoc\n"); |
64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { | 64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { |
65 | usb_unlink_urb(dev->adev.urb[i]); | 65 | usb_kill_urb(dev->adev.urb[i]); |
66 | usb_free_urb(dev->adev.urb[i]); | 66 | usb_free_urb(dev->adev.urb[i]); |
67 | dev->adev.urb[i] = NULL; | 67 | dev->adev.urb[i] = NULL; |
68 | 68 | ||