Skip to content

Commit dea5920

Browse files
Stanislaw Gruszkagregkh
authored andcommitted
rt2x00: do not drop usb dev reference counter on suspend
commit 543cc38 upstream. When hibernating ->resume may not be called by usb core, but disconnect and probe instead, so we do not increase the counter after decreasing it in ->supend. As a result we free memory early, and get crash when unplugging usb dongle. BUG: unable to handle kernel paging request at 6b6b6b9f IP: [<c06909b0>] driver_sysfs_remove+0x10/0x30 *pdpt = 0000000034f21001 *pde = 0000000000000000 Pid: 20, comm: khubd Not tainted 3.1.0-rc1-wl+ torvalds#20 LENOVO 6369CTO/6369CTO EIP: 0060:[<c06909b0>] EFLAGS: 00010202 CPU: 1 EIP is at driver_sysfs_remove+0x10/0x30 EAX: 6b6b6b6b EBX: f52bba34 ECX: 00000000 EDX: 6b6b6b6b ESI: 6b6b6b6b EDI: c0a0ea20 EBP: f61c9e68 ESP: f61c9e64 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process khubd (pid: 20, ti=f61c8000 task=f6138270 task.ti=f61c8000) Call Trace: [<c06909ef>] __device_release_driver+0x1f/0xa0 [<c0690b20>] device_release_driver+0x20/0x40 [<c068fd64>] bus_remove_device+0x84/0xe0 [<c068e12a>] ? device_remove_attrs+0x2a/0x80 [<c068e267>] device_del+0xe7/0x170 [<c06d93d4>] usb_disconnect+0xd4/0x180 [<c06d9d61>] hub_thread+0x691/0x1600 [<c0473260>] ? wake_up_bit+0x30/0x30 [<c0442a39>] ? complete+0x49/0x60 [<c06d96d0>] ? hub_disconnect+0xd0/0xd0 [<c06d96d0>] ? hub_disconnect+0xd0/0xd0 [<c0472eb4>] kthread+0x74/0x80 [<c0472e40>] ? kthread_worker_fn+0x150/0x150 [<c0809b3e>] kernel_thread_helper+0x6/0x10 Signed-off-by: Stanislaw Gruszka <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6417bec commit dea5920

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

drivers/net/wireless/rt2x00/rt2x00usb.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -870,18 +870,8 @@ int rt2x00usb_suspend(struct usb_interface *usb_intf, pm_message_t state)
870870
{
871871
struct ieee80211_hw *hw = usb_get_intfdata(usb_intf);
872872
struct rt2x00_dev *rt2x00dev = hw->priv;
873-
int retval;
874-
875-
retval = rt2x00lib_suspend(rt2x00dev, state);
876-
if (retval)
877-
return retval;
878873

879-
/*
880-
* Decrease usbdev refcount.
881-
*/
882-
usb_put_dev(interface_to_usbdev(usb_intf));
883-
884-
return 0;
874+
return rt2x00lib_suspend(rt2x00dev, state);
885875
}
886876
EXPORT_SYMBOL_GPL(rt2x00usb_suspend);
887877

@@ -890,8 +880,6 @@ int rt2x00usb_resume(struct usb_interface *usb_intf)
890880
struct ieee80211_hw *hw = usb_get_intfdata(usb_intf);
891881
struct rt2x00_dev *rt2x00dev = hw->priv;
892882

893-
usb_get_dev(interface_to_usbdev(usb_intf));
894-
895883
return rt2x00lib_resume(rt2x00dev);
896884
}
897885
EXPORT_SYMBOL_GPL(rt2x00usb_resume);

0 commit comments

Comments
 (0)