diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/prism54 | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/prism54')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 912fdc022d08..77cd65db8500 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
| @@ -2067,7 +2067,7 @@ send_simple_event(islpci_private *priv, const char *str) | |||
| 2067 | memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL); | 2067 | memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL); |
| 2068 | if (!memptr) | 2068 | if (!memptr) |
| 2069 | return; | 2069 | return; |
| 2070 | BUG_ON(n > IW_CUSTOM_MAX); | 2070 | BUG_ON(n >= IW_CUSTOM_MAX); |
| 2071 | wrqu.data.pointer = memptr; | 2071 | wrqu.data.pointer = memptr; |
| 2072 | wrqu.data.length = n; | 2072 | wrqu.data.length = n; |
| 2073 | strcpy(memptr, str); | 2073 | strcpy(memptr, str); |