lkml.org 
[lkml]   [2007]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 06/21] net/smc911x: match up spin lock/unlock
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Peter Korsgaard <jacmet@sunsite.dk>

    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>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/smc911x.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- linux-2.6.19.4.orig/drivers/net/smc911x.c
    +++ linux-2.6.19.4/drivers/net/smc911x.c
    @@ -965,11 +965,11 @@ static void smc911x_phy_configure(void *
    * 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);

    @@ -1038,6 +1038,7 @@ static void smc911x_phy_configure(void *

    smc911x_phy_configure_exit:
    spin_unlock_irqrestore(&lp->lock, flags);
    +smc911x_phy_configure_exit_nolock:
    lp->work_pending = 0;
    }

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-21 02:43    [W:0.019 / U:5.372 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site