Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250193
b: refs/heads/master
c: 26b72c6
h: refs/heads/master
i:
  250191: 58f6d57
v: v3
  • Loading branch information
Florian Mickler authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent 9e8bb82 commit ec71470
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60f81f12fa63213567b0b40546faa82b8f5d5b0c
refs/heads/master: 26b72c6e5a67ceef4c62c279d5952f723515d990
18 changes: 15 additions & 3 deletions trunk/drivers/media/dvb/dvb-usb/ec168.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
int ret;
unsigned int pipe;
u8 request, requesttype;
u8 buf[req->size];
u8 *buf;



switch (req->cmd) {
case DOWNLOAD_FIRMWARE:
Expand Down Expand Up @@ -72,6 +74,12 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
goto error;
}

buf = kmalloc(req->size, GFP_KERNEL);
if (!buf) {
ret = -ENOMEM;
goto error;
}

if (requesttype == (USB_TYPE_VENDOR | USB_DIR_OUT)) {
/* write */
memcpy(buf, req->data, req->size);
Expand All @@ -84,21 +92,25 @@ static int ec168_rw_udev(struct usb_device *udev, struct ec168_req *req)
msleep(1); /* avoid I2C errors */

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,
req->size, deb_xfer);

if (ret < 0)
goto error;
goto err_dealloc;
else
ret = 0;

/* read request, copy returned data to return buf */
if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
memcpy(req->data, buf, req->size);

kfree(buf);
return ret;

err_dealloc:
kfree(buf);
error:
deb_info("%s: failed:%d\n", __func__, ret);
return ret;
Expand Down

0 comments on commit ec71470

Please sign in to comment.