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>

1 files changed, 4 insertions, 9 deletions

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);