Re: w35und driver unusable

[Pekka Enberg <penberg@cs.helsinki.fi>]

Hi!

On Wed, 2009-03-18 at 22:22 +0800, luoyi wrote:
> just rmmod and modprobe it will trigger the oops.
> 
> I've just upload a oops snapshot picture onto flickr:
> 
> http://www.flickr.com/photos/21260339@N03/3364812089/
> 
> hope it will help for you.

Can you try this patch, please?

>From 727c633f7ac374261752b269ee77c007bd55a527 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 23 Mar 2009 10:17:36 +0200
Subject: [PATCH] w35und: unregister device from the ieee80211 stack upon ->disconnect()

This patch fixes an oops when the w35und module is removed from the kernel and
added back.

Reported-by: luoyi <luoyi.ly@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/wbusb.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index f716b2e..7a7aa9a 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
 	if (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));
 }
-- 
1.5.4.3