diff options
author | Karsten Keil <keil@b1-systems.de> | 2012-09-13 00:36:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-13 14:58:54 -0400 |
commit | 4b921eda53366b319602351ff4d7256fafa4bd1b (patch) | |
tree | a60091cf40391abd4eb1452dc840289bd05bfd19 /drivers/isdn/hardware/mISDN/mISDNisar.c | |
parent | 930521695c183c8a4da8fe13ce231cf5263b8d98 (diff) |
mISDN: Fix wrong usage of flush_work_sync while holding locks
It is a bad idea to hold a spinlock and call flush_work_sync.
Move the workqueue cleanup outside the spinlock and use cancel_work_sync,
on closing the channel this seems to be the more correct function.
Remove the never used and constant return value of mISDN_freebchannel.
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Cc: <stable@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hardware/mISDN/mISDNisar.c')
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNisar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index be5973ded6d6..182ecf0626c2 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
@@ -1588,8 +1588,9 @@ isar_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) | |||
1588 | switch (cmd) { | 1588 | switch (cmd) { |
1589 | case CLOSE_CHANNEL: | 1589 | case CLOSE_CHANNEL: |
1590 | test_and_clear_bit(FLG_OPEN, &bch->Flags); | 1590 | test_and_clear_bit(FLG_OPEN, &bch->Flags); |
1591 | cancel_work_sync(&bch->workq); | ||
1591 | spin_lock_irqsave(ich->is->hwlock, flags); | 1592 | spin_lock_irqsave(ich->is->hwlock, flags); |
1592 | mISDN_freebchannel(bch); | 1593 | mISDN_clear_bchannel(bch); |
1593 | modeisar(ich, ISDN_P_NONE); | 1594 | modeisar(ich, ISDN_P_NONE); |
1594 | spin_unlock_irqrestore(ich->is->hwlock, flags); | 1595 | spin_unlock_irqrestore(ich->is->hwlock, flags); |
1595 | ch->protocol = ISDN_P_NONE; | 1596 | ch->protocol = ISDN_P_NONE; |