diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 17:05:07 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 17:05:07 -0200 |
| commit | 35098755c90373eb932f02f71ec986e9d4a6f49b (patch) | |
| tree | c5e3b04ce2663b1a3184d7b155d04a2a420c2643 /linux/drivers/media/video/pvrusb2/pvrusb2-io.c | |
| parent | b6893c1c0a9345aa661d24496e494400283c2c46 (diff) | |
| download | mediapointer-dvb-s2-35098755c90373eb932f02f71ec986e9d4a6f49b.tar.gz mediapointer-dvb-s2-35098755c90373eb932f02f71ec986e9d4a6f49b.tar.bz2 | |
Backported several changes from kernel 2.6.19-git series
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Main changes:
- There were several checks for usb release routines that were removed, since
the routine itself checks for null values:
usb_free_urb, usb_kill_urb, usb_unlink_urb
Should be checked if this really happens on older kernels.
- updated sound/oss/btaudio.c
- replaced SLAB_ATOMIC to GFP_ATOMIC
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-io.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c index afb378b2a..61c553ddf 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c @@ -309,7 +309,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp) pvr2_buffer_set_none(bp); bp->signature = 0; bp->stream = NULL; - if (bp->purb) usb_free_urb(bp->purb); + usb_free_urb(bp->purb); pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/" " bufferDone %p",bp); } |