diff options
| author | Florian Mickler | 2011-03-21 19:33:41 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-05-20 14:27:53 +0200 |
| commit | 54f4e11ae3051ff7a921494be5106788db19dcf7 (patch) | |
| tree | f10ea437eedd792a090c2d6cacbfd1719a2d0f89 /drivers/media | |
| parent | [media] dib0700: remove unused variable (diff) | |
| download | kernel-qcow2-linux-54f4e11ae3051ff7a921494be5106788db19dcf7.tar.gz kernel-qcow2-linux-54f4e11ae3051ff7a921494be5106788db19dcf7.tar.xz kernel-qcow2-linux-54f4e11ae3051ff7a921494be5106788db19dcf7.zip | |
[media] a800: get rid of on-stack dma buffers
usb_control_msg initiates (and waits for completion of) a dma transfer using
the supplied buffer. That buffer thus has to be seperately allocated on
the heap.
In lib/dma_debug.c the function check_for_stack even warns about it:
WARNING: at lib/dma-debug.c:866 check_for_stack
Note: This change is tested to compile only, as I don't have the hardware.
Signed-off-by: Florian Mickler <florian@mickler.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/a800.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c index f8e9bf116f21..b95a95e17840 100644 --- a/drivers/media/dvb/dvb-usb/a800.c +++ b/drivers/media/dvb/dvb-usb/a800.c @@ -78,17 +78,26 @@ static struct rc_map_table rc_map_a800_table[] = { static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state) { - u8 key[5]; + int ret; + u8 *key = kmalloc(5, GFP_KERNEL); + if (!key) + return -ENOMEM; + if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0), 0x04, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, key, 5, - 2000) != 5) - return -ENODEV; + 2000) != 5) { + ret = -ENODEV; + goto out; + } /* call the universal NEC remote processor, to find out the key's state and event */ dvb_usb_nec_rc_key_to_event(d,key,event,state); if (key[0] != 0) deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]); - return 0; + ret = 0; +out: + kfree(key); + return ret; } /* USB Driver stuff */ |