w35und: unregister device from the ieee80211 stack upon ->disconnect()
PATCH 1/1 w35und: unregister device from the ieee80211 stack upon ->disconnect()
From: Pekka Enberg <[email protected]>
Impact: fix module removal
This patch fixes an oops when the w35und module is removed from the kernel and added back.
Reported-by luoyi <[email protected]>
Tested-by Sandro Bonazzola <[email protected]>
Cc Pavel Machek <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
---
Greg, I think this should go into 2.6.30.
drivers/staging/winbond/wbusb.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/staging/winbond/wbusb.c +7 -2
@@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *idif (err) goto error_free_hw; -usb_set_intfdata (intf, priv); +usb_set_intfdata (intf, dev);return 0 ;
@@ -415,10 +415,15 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)static void wb35_disconnect (struct usb_interface *intf) { -struct wbsoft_priv *priv =usb_get_intfdata (intf); +struct ieee80211_hw *hw =usb_get_intfdata (intf); +struct wbsoft_priv *priv = hw->priv;wb35_hw_halt (priv); +ieee80211_stop_queues (hw); +ieee80211_unregister_hw (hw); +ieee80211_free_hw (hw); +usb_set_intfdata (intf,NULL );usb_put_dev (interface_to_usbdev (intf)); }
Signature · 1 line
1.5.4.3