From 2ddbf3696996f553344fbc0eabd91829039475a7 Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Thu, 17 Nov 2011 18:43:40 -0300 Subject: [PATCH] --- yaml --- r: 285314 b: refs/heads/master c: 6d00c9aa2bb98909de21eaaf767b9ed76fe26f86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pwc/pwc-ctrl.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75563b586042..c1b0bc2e1590 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ceaec188e7784c7f9ab5fca110fecb790837dbc +refs/heads/master: 6d00c9aa2bb98909de21eaaf767b9ed76fe26f86 diff --git a/trunk/drivers/media/video/pwc/pwc-ctrl.c b/trunk/drivers/media/video/pwc/pwc-ctrl.c index 3977addf3ba8..b42c239de9cf 100644 --- a/trunk/drivers/media/video/pwc/pwc-ctrl.c +++ b/trunk/drivers/media/video/pwc/pwc-ctrl.c @@ -113,10 +113,9 @@ static int _send_control_msg(struct pwc_device *pdev, void *kbuf = NULL; if (buflen) { - kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */ + kbuf = kmemdup(buf, buflen, GFP_KERNEL); /* not allowed on stack */ if (kbuf == NULL) return -ENOMEM; - memcpy(kbuf, buf, buflen); } rc = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),