diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2010-09-30 13:34:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-01 00:33:32 -0700 |
| commit | b33ffa5cbf52ee751bb8068218ebb3c742c5a515 (patch) | |
| tree | b97dc8afef26b82c8064cf1eff63710d028434a2 /drivers/isdn/gigaset | |
| parent | c7ebfdaca0b89fe9d846e93b249303313612d0e3 (diff) | |
| download | op-kernel-dev-b33ffa5cbf52ee751bb8068218ebb3c742c5a515.zip op-kernel-dev-b33ffa5cbf52ee751bb8068218ebb3c742c5a515.tar.gz | |
isdn/gigaset: bas_gigaset locking fix
Unlock cs->lock before calling error_hangup() which is marked
"cs->lock must not be held".
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
CC: stable <stable@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/gigaset')
| -rw-r--r-- | drivers/isdn/gigaset/bas-gigaset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 707d9c9..e143050 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c @@ -1598,13 +1598,13 @@ static int gigaset_init_bchannel(struct bc_state *bcs) ret = starturbs(bcs); if (ret < 0) { + spin_unlock_irqrestore(&cs->lock, flags); dev_err(cs->dev, "could not start isochronous I/O for channel B%d: %s\n", bcs->channel + 1, ret == -EFAULT ? "null URB" : get_usb_rcmsg(ret)); if (ret != -ENODEV) error_hangup(bcs); - spin_unlock_irqrestore(&cs->lock, flags); return ret; } @@ -1614,11 +1614,11 @@ static int gigaset_init_bchannel(struct bc_state *bcs) dev_err(cs->dev, "could not open channel B%d\n", bcs->channel + 1); stopurbs(bcs->hw.bas); - if (ret != -ENODEV) - error_hangup(bcs); } spin_unlock_irqrestore(&cs->lock, flags); + if (ret < 0 && ret != -ENODEV) + error_hangup(bcs); return ret; } |
