diff options
| author | Karsten Keil <kkeil@linux-pingi.de> | 2012-05-16 01:51:01 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 21:22:06 +0200 |
| commit | 1368112c07bae879fa3d1c21f236ca8eea3e5e84 (patch) | |
| tree | 3467a277cc350bbfaf3e98df9513d4209e63f984 /drivers/isdn/hardware/mISDN/avmfritz.c | |
| parent | Documentation/networking/ieee802154: update MAC chapter (diff) | |
| download | linux-1368112c07bae879fa3d1c21f236ca8eea3e5e84.tar.xz linux-1368112c07bae879fa3d1c21f236ca8eea3e5e84.zip | |
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>
Diffstat (limited to 'drivers/isdn/hardware/mISDN/avmfritz.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/avmfritz.c | 12 |
1 files changed, 4 insertions, 8 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); |