From: Tilman Schmidt Date: Wed, 24 Oct 2012 08:44:32 +0000 (+0000) Subject: bas_gigaset: fix pre_reset handling X-Git-Tag: v3.7-rc3~7^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6fdd8e5d0c65bb8821dc6da26ee1a2ddd58b3cc;p=pandora-kernel.git bas_gigaset: fix pre_reset handling 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 Signed-off-by: David S. Miller --- Reading git-diff-tree failed