From 995ea372fea7d7f73d218294ee62232e3d6db4c5 Mon Sep 17 00:00:00 2001 From: Hante Meuleman Date: Thu, 13 Sep 2012 21:12:04 +0200 Subject: [PATCH] --- yaml --- r: 328223 b: refs/heads/master c: 9cd23a7191f1abc32252ba92494a910d5cc5fd02 h: refs/heads/master i: 328221: f3391d4c10521ae8762b5418c325ebd4c42be984 328219: e6af5da8f4c7c378730e8b3598fa1e085f357721 328215: 9a0f9a40a1661103bcd401599f365c4577d7ba6f 328207: 0351cdaf00c5a0ab4fedde4a95a63a5c7c6e60af 328191: ac852d27170ed6603614b48034e0bae0e5f1865c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 802debac03f2..738a620cf73a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4531603a7acb1463ec0b466dcfedc6682e7a1718 +refs/heads/master: 9cd23a7191f1abc32252ba92494a910d5cc5fd02 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index c6d5aeb27a02..03f59cd0572a 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -1340,10 +1340,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo, struct device *dev = devinfo->dev; bus_pub = brcmf_usb_attach(devinfo, BRCMF_USB_NRXQ, BRCMF_USB_NTXQ); - if (!bus_pub) { - ret = -ENODEV; - goto fail; - } + if (!bus_pub) + return -ENODEV; bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC); if (!bus) {