From b43ab8704988bdd43c35326425a04ec53d2a5db4 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 27 Oct 2008 23:29:31 +0200
Subject: [PATCH] --- yaml --- r: 126559 b: refs/heads/master c:
 4af12e55a5f5e8d0d6d9390a592daa789a181e36 h: refs/heads/master i:   126557:
 1e481f7be071696faf552b48ed9e92d32b206519   126555:
 9b1dacb04ca44f3a1f19afc041383767e535270f   126551:
 e1630721d2804c6f6113242f75e01ad1c785b612   126543:
 8d49a094799ce66c4501a38e24b8967b722ecbd1   126527:
 d40fc292e9b67fcc60a196cf37fd93c404e96cd0 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/winbond/linux/wbusb.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 03716538ff45..413f829b8f16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8b2b70b4334acbbc4daa445aa21b1fe6d337ac3
+refs/heads/master: 4af12e55a5f5e8d0d6d9390a592daa789a181e36
diff --git a/trunk/drivers/staging/winbond/linux/wbusb.c b/trunk/drivers/staging/winbond/linux/wbusb.c
index eb115034498a..d9c3a16c4156 100644
--- a/trunk/drivers/staging/winbond/linux/wbusb.c
+++ b/trunk/drivers/staging/winbond/linux/wbusb.c
@@ -275,6 +275,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
 error_free_adapter:
 	kfree(adapter);
 error:
+	usb_put_dev(udev);
 	return err;
 }
 
@@ -308,12 +309,12 @@ void packet_came(char *pRxBufferAddress, int PacketSize)
 
 static void wb35_disconnect(struct usb_interface *intf)
 {
-	struct wb35_adapter * adapter = usb_get_intfdata(intf);
-	usb_set_intfdata(intf, NULL);
+	struct wb35_adapter *adapter = usb_get_intfdata(intf);
 
-	// Card remove
 	WbWlanHalt(adapter);
 
+	usb_set_intfdata(intf, NULL);
+	usb_put_dev(interface_to_usbdev(intf));
 }
 
 static struct usb_driver wb35_driver = {