diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-07 18:37:33 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-07 18:37:33 +0100 |
| commit | 307ba6dd73254fe7d2ce27db64ffd90e1bb3c6c0 (patch) | |
| tree | 535e10e6bd399c1f1d1f55a546e0c6aa92ba9dee /drivers/uwb/hwa-rc.c | |
| parent | uwb: per-radio controller event thread and beacon cache (diff) | |
| download | linux-307ba6dd73254fe7d2ce27db64ffd90e1bb3c6c0.tar.xz linux-307ba6dd73254fe7d2ce27db64ffd90e1bb3c6c0.zip | |
uwb: don't unbind the radio controller driver when resetting
Use pre_reset and post_reset methods to avoid unbinding the radio
controller driver after a uwb_rc_reset_all() call. This avoids a
deadlock in uwb_rc_rm() when waiting for the uwb event thread to stop.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Diffstat (limited to 'drivers/uwb/hwa-rc.c')
| -rw-r--r-- | drivers/uwb/hwa-rc.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c index 18009c99577d..158e98d08af9 100644 --- a/drivers/uwb/hwa-rc.c +++ b/drivers/uwb/hwa-rc.c @@ -881,6 +881,24 @@ static void hwarc_disconnect(struct usb_interface *iface) uwb_rc_put(uwb_rc); /* when creating the device, refcount = 1 */ } +static int hwarc_pre_reset(struct usb_interface *iface) +{ + struct hwarc *hwarc = usb_get_intfdata(iface); + struct uwb_rc *uwb_rc = hwarc->uwb_rc; + + uwb_rc_pre_reset(uwb_rc); + return 0; +} + +static int hwarc_post_reset(struct usb_interface *iface) +{ + struct hwarc *hwarc = usb_get_intfdata(iface); + struct uwb_rc *uwb_rc = hwarc->uwb_rc; + + uwb_rc_post_reset(uwb_rc); + return 0; +} + /** USB device ID's that we handle */ static struct usb_device_id hwarc_id_table[] = { /* D-Link DUB-1210 */ @@ -897,9 +915,11 @@ MODULE_DEVICE_TABLE(usb, hwarc_id_table); static struct usb_driver hwarc_driver = { .name = "hwa-rc", + .id_table = hwarc_id_table, .probe = hwarc_probe, .disconnect = hwarc_disconnect, - .id_table = hwarc_id_table, + .pre_reset = hwarc_pre_reset, + .post_reset = hwarc_post_reset, }; static int __init hwarc_driver_init(void) |