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/dvb/dvb-usb | |
| 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/dvb/dvb-usb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/usb-urb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/usb-urb.c b/linux/drivers/media/dvb/dvb-usb/usb-urb.c index 2ed0a214b..5caec2034 100644 --- a/linux/drivers/media/dvb/dvb-usb/usb-urb.c +++ b/linux/drivers/media/dvb/dvb-usb/usb-urb.c @@ -120,7 +120,7 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num, for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { deb_mem("allocating buffer %d\n",stream->buf_num); if (( stream->buf_list[stream->buf_num] = - usb_buffer_alloc(stream->udev, size, SLAB_ATOMIC, + usb_buffer_alloc(stream->udev, size, GFP_ATOMIC, &stream->dma_addr[stream->buf_num]) ) == NULL) { deb_mem("not enough memory for urb-buffer allocation.\n"); usb_free_stream_buffers(stream); |