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/ttusb-dec | |
| 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/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index aab71ee63..b1598680d 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -1155,8 +1155,7 @@ static void ttusb_dec_free_iso_urbs(struct ttusb_dec *dec) dprintk("%s\n", __FUNCTION__); for (i = 0; i < ISO_BUF_COUNT; i++) - if (dec->iso_urb[i]) - usb_free_urb(dec->iso_urb[i]); + usb_free_urb(dec->iso_urb[i]); pci_free_consistent(NULL, ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * @@ -1271,7 +1270,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec) return -ENOMEM; } dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE, - SLAB_ATOMIC, &dec->irq_dma_handle); + GFP_ATOMIC, &dec->irq_dma_handle); if(!dec->irq_buffer) { return -ENOMEM; } |