Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193540
b: refs/heads/master
c: 641d446
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Dmitry Torokhov committed May 19, 2010
1 parent 5049d95 commit 037258c
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 685afae02557a178185a4be36f58332976e79f63
refs/heads/master: 641d446f89314d19fe17fcb9f19659a09fabe418
5 changes: 2 additions & 3 deletions trunk/drivers/input/touchscreen/usbtouchscreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -811,12 +811,11 @@ static int nexio_init(struct usbtouch_usb *usbtouch)

priv = usbtouch->priv;

priv->ack_buf = kmalloc(sizeof(nexio_ack_pkt), GFP_KERNEL);
priv->ack_buf = kmemdup(nexio_ack_pkt, sizeof(nexio_ack_pkt),
GFP_KERNEL);
if (!priv->ack_buf)
goto err_priv;

memcpy(priv->ack_buf, nexio_ack_pkt, sizeof(nexio_ack_pkt));

priv->ack = usb_alloc_urb(0, GFP_KERNEL);
if (!priv->ack) {
dbg("%s - usb_alloc_urb failed: usbtouch->ack", __func__);
Expand Down

0 comments on commit 037258c

Please sign in to comment.