2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Tilman Schmidt <[email protected]> commit b33ffa5cbf52ee751bb8068218ebb3c742c5a515 upstream. Unlock cs->lock before calling error_hangup() which is marked "cs->lock must not be held". Signed-off-by: Tilman Schmidt <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/isdn/gigaset/bas-gigaset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux/drivers/isdn/gigaset/bas-gigaset.c =================================================================== --- linux.orig/drivers/isdn/gigaset/bas-gigaset.c +++ linux/drivers/isdn/gigaset/bas-gigaset.c @@ -1599,13 +1599,13 @@ static int gigaset_init_bchannel(struct 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; } @@ -1615,11 +1615,11 @@ static int gigaset_init_bchannel(struct 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; } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
