From 037258c4e8515be6e95c765a60288b37101b73eb Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 19 May 2010 10:11:14 -0700 Subject: [PATCH] --- yaml --- r: 193540 b: refs/heads/master c: 641d446f89314d19fe17fcb9f19659a09fabe418 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/usbtouchscreen.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 72695edb739e..1a778ddbb8a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 685afae02557a178185a4be36f58332976e79f63 +refs/heads/master: 641d446f89314d19fe17fcb9f19659a09fabe418 diff --git a/trunk/drivers/input/touchscreen/usbtouchscreen.c b/trunk/drivers/input/touchscreen/usbtouchscreen.c index 99330bbdbac7..0b0ae2e17a60 100644 --- a/trunk/drivers/input/touchscreen/usbtouchscreen.c +++ b/trunk/drivers/input/touchscreen/usbtouchscreen.c @@ -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__);