diff options
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 208d25700040..c1a662b065b0 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -99,7 +99,7 @@ static int if_usb_probe(struct usb_interface *intf, | |||
99 | struct usb_device *udev; | 99 | struct usb_device *udev; |
100 | struct usb_host_interface *iface_desc; | 100 | struct usb_host_interface *iface_desc; |
101 | struct usb_endpoint_descriptor *endpoint; | 101 | struct usb_endpoint_descriptor *endpoint; |
102 | wlan_private *pwlanpriv; | 102 | wlan_private *priv; |
103 | struct usb_card_rec *usb_cardp; | 103 | struct usb_card_rec *usb_cardp; |
104 | int i; | 104 | int i; |
105 | 105 | ||
@@ -187,7 +187,9 @@ static int if_usb_probe(struct usb_interface *intf, | |||
187 | * about keeping pwlanpriv around since it will be set on our | 187 | * about keeping pwlanpriv around since it will be set on our |
188 | * usb device data in -> add() -> libertas_sbi_register_dev(). | 188 | * usb device data in -> add() -> libertas_sbi_register_dev(). |
189 | */ | 189 | */ |
190 | if (!(pwlanpriv = wlan_add_card(usb_cardp))) | 190 | if (!(priv = wlan_add_card(usb_cardp))) |
191 | goto dealloc; | ||
192 | if (wlan_add_mesh(priv)) | ||
191 | goto dealloc; | 193 | goto dealloc; |
192 | 194 | ||
193 | usb_get_dev(udev); | 195 | usb_get_dev(udev); |
@@ -228,6 +230,7 @@ static void if_usb_disconnect(struct usb_interface *intf) | |||
228 | 230 | ||
229 | /* card is removed and we can call wlan_remove_card */ | 231 | /* card is removed and we can call wlan_remove_card */ |
230 | lbs_deb_usbd(&cardp->udev->dev, "call remove card\n"); | 232 | lbs_deb_usbd(&cardp->udev->dev, "call remove card\n"); |
233 | wlan_remove_mesh(priv); | ||
231 | wlan_remove_card(cardp); | 234 | wlan_remove_card(cardp); |
232 | 235 | ||
233 | /* Unlink and free urb */ | 236 | /* Unlink and free urb */ |