p54spi: Fix workqueue deadlock
authorMichael Büsch <m@bues.ch>
Wed, 16 Nov 2011 22:55:46 +0000 (23:55 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Dec 2011 16:52:29 +0000 (08:52 -0800)
commit23e76fdc4cc34c116b37eedc2a3a8ecaa081541e
tree146b094dcea6b6a8816f317706fa3eb545809057
parent00b080367aca3dbb6191cbe522609d2055ea0fd8
p54spi: Fix workqueue deadlock

commit 2d1618170eb493d18f66f2ac03775409a6fb97c6 upstream.

priv->work must not be synced while priv->mutex is locked, because
the mutex is taken in the work handler.
Move cancel_work_sync down to after the device shutdown code.
This is safe, because the work handler checks fw_state and bails out
early in case of a race.

Signed-off-by: Michael Buesch <m@bues.ch>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/wireless/p54/p54spi.c