Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / brcm80211 / brcmfmac / usb.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index a55994d337630a1fa5758675a0119d5f733acf7c..42289e9ea8863d0bee3d04a78dbcdf0e46d17c5d 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -354,11 +354,10 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
        int i;
        struct brcmf_usbreq *req, *reqs;
 
-       reqs = kzalloc(sizeof(struct brcmf_usbreq) * qsize, GFP_ATOMIC);
-       if (reqs == NULL) {
-               brcmf_err("fail to allocate memory!\n");
+       reqs = kcalloc(qsize, sizeof(struct brcmf_usbreq), GFP_ATOMIC);
+       if (reqs == NULL)
                return NULL;
-       }
+
        req = reqs;
 
        for (i = 0; i < qsize; i++) {