projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
[linux-2.6-block.git]
/
drivers
/
media
/
dvb
/
ttusb-dec
/
ttusb_dec.c
diff --git
a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 53baccbab17f0bdc1c7eb5686628dd4d7d5d822d..fe1b8037b247995a6740071d4f50e196fe127c26 100644
(file)
--- a/
drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/
drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@
-1257,7
+1257,7
@@
static int ttusb_dec_init_usb(struct ttusb_dec *dec)
if(!dec->irq_urb) {
return -ENOMEM;
}
if(!dec->irq_urb) {
return -ENOMEM;
}
- dec->irq_buffer = usb_
buffer_alloc
(dec->udev,IRQ_PACKET_SIZE,
+ dec->irq_buffer = usb_
alloc_coherent
(dec->udev,IRQ_PACKET_SIZE,
GFP_ATOMIC, &dec->irq_dma_handle);
if(!dec->irq_buffer) {
usb_free_urb(dec->irq_urb);
GFP_ATOMIC, &dec->irq_dma_handle);
if(!dec->irq_buffer) {
usb_free_urb(dec->irq_urb);
@@
-1550,8
+1550,8
@@
static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
usb_free_urb(dec->irq_urb);
usb_free_urb(dec->irq_urb);
- usb_
buffer_free
(dec->udev,IRQ_PACKET_SIZE,
-
dec->irq_buffer, dec->irq_dma_handle);
+ usb_
free_coherent
(dec->udev,IRQ_PACKET_SIZE,
+ dec->irq_buffer, dec->irq_dma_handle);
if (dec->rc_input_dev) {
input_unregister_device(dec->rc_input_dev);
if (dec->rc_input_dev) {
input_unregister_device(dec->rc_input_dev);