projects
/
firefly-linux-kernel-4.4.55.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...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt61pci.c
diff --git
a/drivers/net/wireless/rt2x00/rt61pci.c
b/drivers/net/wireless/rt2x00/rt61pci.c
index 18829b2eccc3948408296b2d64be669735b4f8aa..3a7759929190b78674aed60783fb5b6793124f4c 100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt61pci.c
+++ b/
drivers/net/wireless/rt2x00/rt61pci.c
@@
-2649,7
+2649,7
@@
static int rt61pci_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;