mISDN: Cleanup channel also if it already was deactivated

If a channel was closed after it was deactivated it could happen that
something was not proper resetted. The test if a channel is still activ
was wrong, so remove it and always do the cleanup.

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 23 insertions, 49 deletions

diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index 6bf2c58795a3..2271f2b7d501 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -839,14 +839,10 @@ avm_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&fc->lock, flags);
-                        mISDN_freebchannel(bch);
-                        test_and_clear_bit(FLG_TX_BUSY, &bch->Flags);
-                        test_and_clear_bit(FLG_ACTIVE, &bch->Flags);
-                        modehdlc(bch, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&fc->lock, flags);
-                }
+                spin_lock_irqsave(&fc->lock, flags);
+                mISDN_freebchannel(bch);
+                modehdlc(bch, ISDN_P_NONE);
+                spin_unlock_irqrestore(&fc->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 9f4e2efa7ff6..1dae761d973e 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -3725,8 +3725,7 @@ hfcm_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch); /* locked there */
+                deactivate_bchannel(bch); /* locked there */
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5fe993e2dee9..f7a5ea7988ed 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1581,8 +1581,7 @@ hfc_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
                 break;
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch);
+                deactivate_bchannel(bch);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 8cde2a0538ab..add28acd54d7 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -1836,8 +1836,7 @@ hfc_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
 
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch);
+                deactivate_bchannel(bch);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 92d4a78bc0a5..6c044d55536b 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -1420,15 +1420,10 @@ hscx_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(hx->ip->hwlock, flags);
-                        mISDN_freebchannel(bch);
-                        hscx_mode(hx, ISDN_P_NONE);
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(hx->ip->hwlock, flags);
+                mISDN_freebchannel(bch);
+                hscx_mode(hx, ISDN_P_NONE);
+                spin_unlock_irqrestore(hx->ip->hwlock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(hx->ip->owner);
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index 9a6da6edcfa8..af9a966a1fdf 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -1603,15 +1603,10 @@ isar_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(ich->is->hwlock, flags);
-                        mISDN_freebchannel(bch);
-                        modeisar(ich, ISDN_P_NONE);
-                        spin_unlock_irqrestore(ich->is->hwlock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(ich->is->hwlock, flags);
+                mISDN_freebchannel(bch);
+                modeisar(ich, ISDN_P_NONE);
+                spin_unlock_irqrestore(ich->is->hwlock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(ich->is->owner);
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index 27998d7188a5..55a77ed7b176 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -808,14 +808,10 @@ nj_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&card->lock, flags);
-                        mISDN_freebchannel(bch);
-                        test_and_clear_bit(FLG_TX_BUSY, &bch->Flags);
-                        test_and_clear_bit(FLG_ACTIVE, &bch->Flags);
-                        mode_tiger(bc, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&card->lock, flags);
-                }
+                spin_lock_irqsave(&card->lock, flags);
+                mISDN_freebchannel(bch);
+                mode_tiger(bc, ISDN_P_NONE);
+                spin_unlock_irqrestore(&card->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 1d044670ff66..0b5e9297e95b 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1061,15 +1061,10 @@ w6692_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&card->lock, flags);
-                        mISDN_freebchannel(bch);
-                        w6692_mode(bc, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&card->lock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(&card->lock, flags);
+                mISDN_freebchannel(bch);
+                w6692_mode(bc, ISDN_P_NONE);
+                spin_unlock_irqrestore(&card->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);