Commit 26b72c6e authored by Florian Mickler's avatar Florian Mickler Committed by Mauro Carvalho Chehab

[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: default avatarFlorian Mickler <florian@mickler.org>
Acked-by: default avatarAntti Palosaari <crope@iki.fi>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Tested-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 60f81f12
...@@ -36,7 +36,9 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) ...@@ -36,7 +36,9 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
int ret; int ret;
unsigned int pipe; unsigned int pipe;
u8 request, requesttype; u8 request, requesttype;
u8 buf[req->size]; u8 *buf;
switch (req->cmd) { switch (req->cmd) {
case DOWNLOAD_FIRMWARE: case DOWNLOAD_FIRMWARE:
...@@ -72,6 +74,12 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) ...@@ -72,6 +74,12 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
goto error; goto error;
} }
buf = kmalloc(req->size, GFP_KERNEL);
if (!buf) {
ret = -ENOMEM;
goto error;
}
if (requesttype == (USB_TYPE_VENDOR | USB_DIR_OUT)) { if (requesttype == (USB_TYPE_VENDOR | USB_DIR_OUT)) {
/* write */ /* write */
memcpy(buf, req->data, req->size); memcpy(buf, req->data, req->size);
...@@ -84,13 +92,13 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) ...@@ -84,13 +92,13 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
msleep(1); /* avoid I2C errors */ msleep(1); /* avoid I2C errors */
ret = usb_control_msg(udev, pipe, request, requesttype, req->value, ret = usb_control_msg(udev, pipe, request, requesttype, req->value,
req->index, buf, sizeof(buf), EC168_USB_TIMEOUT); req->index, buf, req->size, EC168_USB_TIMEOUT);
ec168_debug_dump(request, requesttype, req->value, req->index, buf, ec168_debug_dump(request, requesttype, req->value, req->index, buf,
req->size, deb_xfer); req->size, deb_xfer);
if (ret < 0) if (ret < 0)
goto error; goto err_dealloc;
else else
ret = 0; ret = 0;
...@@ -98,7 +106,11 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req) ...@@ -98,7 +106,11 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN)) if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
memcpy(req->data, buf, req->size); memcpy(req->data, buf, req->size);
kfree(buf);
return ret; return ret;
err_dealloc:
kfree(buf);
error: error:
deb_info("%s: failed:%d\n", __func__, ret); deb_info("%s: failed:%d\n", __func__, ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment