diff options
author | Karsten Keil <kkeil@linux-pingi.de> | 2012-05-15 23:51:01 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-16 15:22:06 -0400 |
commit | 1368112c07bae879fa3d1c21f236ca8eea3e5e84 (patch) | |
tree | 3467a277cc350bbfaf3e98df9513d4209e63f984 /drivers/isdn/hardware/mISDN/hfcsusb.c | |
parent | dd456d45d7edd01f4054818dd404ec61ca55cbc1 (diff) | |
download | linux-stable-1368112c07bae879fa3d1c21f236ca8eea3e5e84.tar.gz linux-stable-1368112c07bae879fa3d1c21f236ca8eea3e5e84.tar.bz2 linux-stable-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/hfcsusb.c')
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); |