From 58a4ba9cd073067760dbedb95aa6465605e6e943 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Sat, 26 Jan 2013 00:19:19 +0100 Subject: [PATCH] --- yaml --- r: 354267 b: refs/heads/master c: 2643c47fa4accb49abf46a1486909e20e4bb5df9 h: refs/heads/master i: 354265: 9db5a84ea9a844b1b121aa791bb5c14319589902 354263: 02d5b083e6720055d2a5f8a71d6d8f4a6d5f28ae v: v3 --- [refs] | 2 +- trunk/drivers/staging/csr/drv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 858fb1b7a3ea..949af2809cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d662b8eba94e9f6d4c036719dbf629ef0c9309cf +refs/heads/master: 2643c47fa4accb49abf46a1486909e20e4bb5df9 diff --git a/trunk/drivers/staging/csr/drv.c b/trunk/drivers/staging/csr/drv.c index 4780c32c2fe3..3bd52fdeac3b 100644 --- a/trunk/drivers/staging/csr/drv.c +++ b/trunk/drivers/staging/csr/drv.c @@ -819,15 +819,15 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) unifi_trace(priv, UDBG2, "unifi_write: signal 0x%.4X len:%d\n", sig_id, signal_size); - /* Allocate a buffer for the signal */ - signal_buf = kmalloc(signal_size, GFP_KERNEL); + /* Allocate a buffer for the signal */ + signal_buf = kmemdup(bulkdata.d[0].os_data_ptr, signal_size, + GFP_KERNEL); if (!signal_buf) { unifi_net_data_free(priv, &bulkdata.d[0]); return -ENOMEM; } /* Get the signal from the os_data_ptr */ - memcpy(signal_buf, bulkdata.d[0].os_data_ptr, signal_size); signal_buf[5] = (pcli->sender_id >> 8) & 0xff; if (signal_size < len) {