diff options
| author | John W. Linville | 2010-07-13 21:57:29 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-07-13 21:57:29 +0200 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/prism54 | |
| parent | hso: remove driver version (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | kernel-qcow2-linux-e300d955debdadf599c36e47eb0bc16f5976215c.tar.gz kernel-qcow2-linux-e300d955debdadf599c36e47eb0bc16f5976215c.tar.xz kernel-qcow2-linux-e300d955debdadf599c36e47eb0bc16f5976215c.zip | |
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) memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL); if (!memptr) return; - BUG_ON(n > IW_CUSTOM_MAX); + BUG_ON(n >= IW_CUSTOM_MAX); wrqu.data.pointer = memptr; wrqu.data.length = n; strcpy(memptr, str); |