projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
wl12xx
/
wl1271_scan.c
diff --git
a/drivers/net/wireless/wl12xx/wl1271_scan.c
b/drivers/net/wireless/wl12xx/wl1271_scan.c
index
5c76b79
..
909bb47
100644
(file)
--- a/
drivers/net/wireless/wl12xx/wl1271_scan.c
+++ b/
drivers/net/wireless/wl12xx/wl1271_scan.c
@@
-292,7
+292,7
@@
int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
wl->scan.req = req;
- wl->scan.scanned_ch = k
zalloc(req->n_channels *
+ wl->scan.scanned_ch = k
calloc(req->n_channels,
sizeof(*wl->scan.scanned_ch),
GFP_KERNEL);
/* we assume failure so that timeout scenarios are handled correctly */