bas_gigaset: fix pre_reset handling
authorTilman Schmidt <tilman@imap.cc>
Wed, 24 Oct 2012 08:44:32 +0000 (08:44 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Dec 2012 19:38:12 +0000 (11:38 -0800)
commit28bd49d3771d3071fe1345fa4f78240230804604
tree57b3c809eda01ecd02ac6c8ae5fb349a3cec102f
parentca3e1522d28f0ce909e5a7936a26ccaadfaac8b1
bas_gigaset: fix pre_reset handling

commit c6fdd8e5d0c65bb8821dc6da26ee1a2ddd58b3cc upstream.

The delayed work function int_in_work() may call usb_reset_device()
and thus, indirectly, the driver's pre_reset method. Trying to
cancel the work synchronously in that situation would deadlock.
Fix by avoiding cancel_work_sync() in the pre_reset method.

If the reset was NOT initiated by int_in_work() this might cause
int_in_work() to run after the post_reset method, with urb_int_in
already resubmitted, so handle that case gracefully.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/isdn/gigaset/bas-gigaset.c