git.openpandora.org
/
pandora-kernel.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...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2400pci.c
diff --git
a/drivers/net/wireless/rt2x00/rt2400pci.c
b/drivers/net/wireless/rt2x00/rt2400pci.c
index
095cb69
..
4f420a9
100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/
drivers/net/wireless/rt2x00/rt2400pci.c
@@
-1494,7
+1494,7
@@
static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = k
zalloc(spec->num_channels *
sizeof(*info), GFP_KERNEL);
+ info = k
calloc(spec->num_channels,
sizeof(*info), GFP_KERNEL);
if (!info)
return -ENOMEM;