bas_gigaset: fix pre_reset handling
authorTilman Schmidt <tilman@imap.cc>
Wed, 24 Oct 2012 08:44:32 +0000 (08:44 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 6 Dec 2012 11:20:17 +0000 (11:20 +0000)
commit9ca6025acefa787bf57ac748fbd987fd79e2d259
treec4fe7bd6ab7fb747fb349d953dd55cd4216c3e31
parenta30fc5988dd488e280fe8d3eb636e6fba00af139
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: Ben Hutchings <ben@decadent.org.uk>
drivers/isdn/gigaset/bas-gigaset.c