From e2469701fd279f30057efd5cbe02c4ea8de07caf Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Thu, 30 Sep 2010 13:34:30 +0000 Subject: [PATCH] --- yaml --- r: 214831 b: refs/heads/master c: b33ffa5cbf52ee751bb8068218ebb3c742c5a515 h: refs/heads/master i: 214829: b3eea195aa9b05e4e01959646cac8a0a30c9c21b 214827: 2ede86c0399a6313236878bb489fbd8f4db7c1c6 214823: c93449a3df248acf8af5a8db647414fcb5531c1c 214815: a3ded0468619f8cdae3150761904ebdecb2fed64 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/gigaset/bas-gigaset.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 720f76ff84a9..a2df5520891e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7ebfdaca0b89fe9d846e93b249303313612d0e3 +refs/heads/master: b33ffa5cbf52ee751bb8068218ebb3c742c5a515 diff --git a/trunk/drivers/isdn/gigaset/bas-gigaset.c b/trunk/drivers/isdn/gigaset/bas-gigaset.c index 707d9c94cf9e..e143050e1b5c 100644 --- a/trunk/drivers/isdn/gigaset/bas-gigaset.c +++ b/trunk/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; }