Commit 24d8f6ad authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Linus Torvalds
Browse files

[PATCH] net/smc911x: match up spin lock/unlock

smc911x_phy_configure's error handling unconditionally unlocks the
spinlock even if it wasn't locked. Patch fixes it.
Signed-off-by: default avatarPeter Korsgaard <>
Cc: Jeff Garzik <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 29a00277
......@@ -968,11 +968,11 @@ static void smc911x_phy_configure(struct work_struct *work)
* We should not be called if phy_type is zero.
if (lp->phy_type == 0)
goto smc911x_phy_configure_exit;
goto smc911x_phy_configure_exit_nolock;
if (smc911x_phy_reset(dev, phyaddr)) {
printk("%s: PHY reset timed out\n", dev->name);
goto smc911x_phy_configure_exit;
goto smc911x_phy_configure_exit_nolock;
spin_lock_irqsave(&lp->lock, flags);
......@@ -1041,6 +1041,7 @@ static void smc911x_phy_configure(struct work_struct *work)
spin_unlock_irqrestore(&lp->lock, flags);
lp->work_pending = 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment