Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b921eda authored by Karsten Keil's avatar Karsten Keil Committed by David S. Miller
Browse files

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: default avatarKarsten Keil <keil@b1-systems.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93052169

drivers/isdn/hardware/mISDN/avmfritz.c

+2 −1
Original line number Diff line number Diff line
@@ -857,8 +857,9 @@ avm_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) 
	switch (cmd) {

	case CLOSE_CHANNEL:

		test_and_clear_bit(FLG_OPEN, &bch->Flags);

		cancel_work_sync(&bch->workq);

		spin_lock_irqsave(&fc->lock, flags);

		mISDN_freebchannel(bch);

		mISDN_clear_bchannel(bch);

		modehdlc(bch, ISDN_P_NONE);

		spin_unlock_irqrestore(&fc->lock, flags);

		ch->protocol = ISDN_P_NONE;

drivers/isdn/hardware/mISDN/mISDNipac.c

+2 −1
Original line number Diff line number Diff line
@@ -1406,8 +1406,9 @@ hscx_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) 
	switch (cmd) {

	case CLOSE_CHANNEL:

		test_and_clear_bit(FLG_OPEN, &bch->Flags);

		cancel_work_sync(&bch->workq);

		spin_lock_irqsave(hx->ip->hwlock, flags);

		mISDN_freebchannel(bch);

		mISDN_clear_bchannel(bch);

		hscx_mode(hx, ISDN_P_NONE);

		spin_unlock_irqrestore(hx->ip->hwlock, flags);

		ch->protocol = ISDN_P_NONE;

drivers/isdn/hardware/mISDN/mISDNisar.c

+2 −1
Original line number Diff line number Diff line
@@ -1588,8 +1588,9 @@ isar_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) 
	switch (cmd) {

	case CLOSE_CHANNEL:

		test_and_clear_bit(FLG_OPEN, &bch->Flags);

		cancel_work_sync(&bch->workq);

		spin_lock_irqsave(ich->is->hwlock, flags);

		mISDN_freebchannel(bch);

		mISDN_clear_bchannel(bch);

		modeisar(ich, ISDN_P_NONE);

		spin_unlock_irqrestore(ich->is->hwlock, flags);

		ch->protocol = ISDN_P_NONE;

drivers/isdn/hardware/mISDN/netjet.c

+2 −1
Original line number Diff line number Diff line
@@ -812,8 +812,9 @@ nj_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) 
	switch (cmd) {

	case CLOSE_CHANNEL:

		test_and_clear_bit(FLG_OPEN, &bch->Flags);

		cancel_work_sync(&bch->workq);

		spin_lock_irqsave(&card->lock, flags);

		mISDN_freebchannel(bch);

		mISDN_clear_bchannel(bch);

		mode_tiger(bc, ISDN_P_NONE);

		spin_unlock_irqrestore(&card->lock, flags);

		ch->protocol = ISDN_P_NONE;

drivers/isdn/hardware/mISDN/w6692.c

+2 −1
Original line number Diff line number Diff line
@@ -1054,8 +1054,9 @@ w6692_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg) 
	switch (cmd) {

	case CLOSE_CHANNEL:

		test_and_clear_bit(FLG_OPEN, &bch->Flags);

		cancel_work_sync(&bch->workq);

		spin_lock_irqsave(&card->lock, flags);

		mISDN_freebchannel(bch);

		mISDN_clear_bchannel(bch);

		w6692_mode(bc, ISDN_P_NONE);

		spin_unlock_irqrestore(&card->lock, flags);

		ch->protocol = ISDN_P_NONE;