openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2025-01-10 18:04:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
smc911x_phy_configure's error handling unconditionally unlocks the
spinlock even if it wasn't locked. Patch fixes it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Peter Korsgaard 2007-02-03 01:13:50 -08:00 committed by Linus Torvalds
parent 29a002776b
commit 24d8f6aded
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/smc911x.c
View File

@ -968,11 +968,11 @@ static void smc911x_phy_configure(struct work_struct *work)
* We should not be called if phy_type is zero. * We should not be called if phy_type is zero.
*/ */
if (lp->phy_type == 0) if (lp->phy_type == 0)
goto smc911x_phy_configure_exit; goto smc911x_phy_configure_exit_nolock;
if (smc911x_phy_reset(dev, phyaddr)) { if (smc911x_phy_reset(dev, phyaddr)) {
printk("%s: PHY reset timed out\n", dev->name); 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); spin_lock_irqsave(&lp->lock, flags);
@ -1041,6 +1041,7 @@ static void smc911x_phy_configure(struct work_struct *work)
smc911x_phy_configure_exit: smc911x_phy_configure_exit:
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
smc911x_phy_configure_exit_nolock:
lp->work_pending = 0; lp->work_pending = 0;
} }