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/mISDN/hwchannel.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/mISDN/hwchannel.c')
-rw-r--r-- | drivers/isdn/mISDN/hwchannel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index ef34fd40867c..2602be23f341 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c | |||
@@ -148,17 +148,16 @@ mISDN_clear_bchannel(struct bchannel *ch) | |||
148 | ch->next_minlen = ch->init_minlen; | 148 | ch->next_minlen = ch->init_minlen; |
149 | ch->maxlen = ch->init_maxlen; | 149 | ch->maxlen = ch->init_maxlen; |
150 | ch->next_maxlen = ch->init_maxlen; | 150 | ch->next_maxlen = ch->init_maxlen; |
151 | skb_queue_purge(&ch->rqueue); | ||
152 | ch->rcount = 0; | ||
151 | } | 153 | } |
152 | EXPORT_SYMBOL(mISDN_clear_bchannel); | 154 | EXPORT_SYMBOL(mISDN_clear_bchannel); |
153 | 155 | ||
154 | int | 156 | void |
155 | mISDN_freebchannel(struct bchannel *ch) | 157 | mISDN_freebchannel(struct bchannel *ch) |
156 | { | 158 | { |
159 | cancel_work_sync(&ch->workq); | ||
157 | mISDN_clear_bchannel(ch); | 160 | mISDN_clear_bchannel(ch); |
158 | skb_queue_purge(&ch->rqueue); | ||
159 | ch->rcount = 0; | ||
160 | flush_work_sync(&ch->workq); | ||
161 | return 0; | ||
162 | } | 161 | } |
163 | EXPORT_SYMBOL(mISDN_freebchannel); | 162 | EXPORT_SYMBOL(mISDN_freebchannel); |
164 | 163 | ||