diff options
| author | David S. Miller | 2010-06-11 20:34:06 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-06-11 20:34:06 +0200 |
| commit | 14599f1e341ee219abdd15f4eee5872d6f2d29f1 (patch) | |
| tree | 3875181429010e58416ab34e6c06ef42de52e756 /drivers/net/wireless/orinoco/wext.c | |
| parent | net-next: remove useless union keyword (diff) | |
| parent | wl1251: fix ELP_CTRL register reads (diff) | |
| download | kernel-qcow2-linux-14599f1e341ee219abdd15f4eee5872d6f2d29f1.tar.gz kernel-qcow2-linux-14599f1e341ee219abdd15f4eee5872d6f2d29f1.tar.xz kernel-qcow2-linux-14599f1e341ee219abdd15f4eee5872d6f2d29f1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/orinoco/wext.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/wext.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 9f86a272cb78..cf7be1eb6124 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c @@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev, return -EINVAL; if (wrqu->data.length) { - buf = kmalloc(wrqu->data.length, GFP_KERNEL); + buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL); if (buf == NULL) return -ENOMEM; - - memcpy(buf, extra, wrqu->data.length); } else buf = NULL; |