diff options
| author | Florian Mickler <florian@mickler.org> | 2011-03-20 17:50:48 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:28:16 -0400 |
| commit | 26b72c6e5a67ceef4c62c279d5952f723515d990 (patch) | |
| tree | bbb00d58967e18e59c0b429bb29d078eb2b1f993 /drivers/media/dvb/dvb-usb | |
| parent | 60f81f12fa63213567b0b40546faa82b8f5d5b0c (diff) | |
[media] ec168: 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
Signed-off-by: Florian Mickler <florian@mickler.org>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Tested-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/ec168.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/ec168.c b/drivers/media/dvb/dvb-usb/ec168.c index 52f5d4f0f230..1ba3e5dbee10 100644 --- a/drivers/media/dvb/dvb-usb/ec168.c +++ b/drivers/media/dvb/dvb-usb/ec168.c | |||
| @@ -36,7 +36,9 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) | |||
| 36 | int ret; | 36 | int ret; |
| 37 | unsigned int pipe; | 37 | unsigned int pipe; |
| 38 | u8 request, requesttype; | 38 | u8 request, requesttype; |
| 39 | u8 buf[req->size]; | 39 | u8 *buf; |
| 40 | |||
| 41 | |||
| 40 | 42 | ||
| 41 | switch (req->cmd) { | 43 | switch (req->cmd) { |
| 42 | case DOWNLOAD_FIRMWARE: | 44 | case DOWNLOAD_FIRMWARE: |
| @@ -72,6 +74,12 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) | |||
| 72 | goto error; | 74 | goto error; |
| 73 | } | 75 | } |
| 74 | 76 | ||
| 77 | buf = kmalloc(req->size, GFP_KERNEL); | ||
| 78 | if (!buf) { | ||
| 79 | ret = -ENOMEM; | ||
| 80 | goto error; | ||
| 81 | } | ||
| 82 | |||
| 75 | if (requesttype == (USB_TYPE_VENDOR | USB_DIR_OUT)) { | 83 | if (requesttype == (USB_TYPE_VENDOR | USB_DIR_OUT)) { |
| 76 | /* write */ | 84 | /* write */ |
| 77 | memcpy(buf, req->data, req->size); | 85 | memcpy(buf, req->data, req->size); |
| @@ -84,13 +92,13 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) | |||
| 84 | msleep(1); /* avoid I2C errors */ | 92 | msleep(1); /* avoid I2C errors */ |
| 85 | 93 | ||
| 86 | ret = usb_control_msg(udev, pipe, request, requesttype, req->value, | 94 | ret = usb_control_msg(udev, pipe, request, requesttype, req->value, |
| 87 | req->index, buf, sizeof(buf), EC168_USB_TIMEOUT); | 95 | req->index, buf, req->size, EC168_USB_TIMEOUT); |
| 88 | 96 | ||
| 89 | ec168_debug_dump(request, requesttype, req->value, req->index, buf, | 97 | ec168_debug_dump(request, requesttype, req->value, req->index, buf, |
| 90 | req->size, deb_xfer); | 98 | req->size, deb_xfer); |
| 91 | 99 | ||
| 92 | if (ret < 0) | 100 | if (ret < 0) |
| 93 | goto error; | 101 | goto err_dealloc; |
| 94 | else | 102 | else |
| 95 | ret = 0; | 103 | ret = 0; |
| 96 | 104 | ||
| @@ -98,7 +106,11 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) | |||
| 98 | if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN)) | 106 | if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN)) |
| 99 | memcpy(req->data, buf, req->size); | 107 | memcpy(req->data, buf, req->size); |
| 100 | 108 | ||
| 109 | kfree(buf); | ||
| 101 | return ret; | 110 | return ret; |
| 111 | |||
| 112 | err_dealloc: | ||
| 113 | kfree(buf); | ||
| 102 | error: | 114 | error: |
| 103 | deb_info("%s: failed:%d\n", __func__, ret); | 115 | deb_info("%s: failed:%d\n", __func__, ret); |
| 104 | return ret; | 116 | return ret; |