aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHante Meuleman <meuleman@broadcom.com>2012-09-13 15:12:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-24 14:59:09 -0400
commit9cd23a7191f1abc32252ba92494a910d5cc5fd02 (patch)
tree9685c6ee43d3d1016d4491fc492dc04c17daeff7 /drivers
parent4531603a7acb1463ec0b466dcfedc6682e7a1718 (diff)
brcmfmac: fix bug causing errorneous free on exception.
This patch fixes bug where driver frees resources twice when an exception occurs. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/usb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index c6d5aeb27a02..03f59cd0572a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1340,10 +1340,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
1340 struct device *dev = devinfo->dev; 1340 struct device *dev = devinfo->dev;
1341 1341
1342 bus_pub = brcmf_usb_attach(devinfo, BRCMF_USB_NRXQ, BRCMF_USB_NTXQ); 1342 bus_pub = brcmf_usb_attach(devinfo, BRCMF_USB_NRXQ, BRCMF_USB_NTXQ);
1343 if (!bus_pub) { 1343 if (!bus_pub)
1344 ret = -ENODEV; 1344 return -ENODEV;
1345 goto fail;
1346 }
1347 1345
1348 bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC); 1346 bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
1349 if (!bus) { 1347 if (!bus) {