netdev
[Top] [All Lists]

[patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio

To: netdev@xxxxxxxxxxx
Subject: [patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio_write
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
Date: Wed, 18 May 2005 13:41:33 -0400
Cc: jgarzik@xxxxxxxxx, Clear.Zhang@xxxxxxxxxx
Mail-followup-to: netdev@xxxxxxxxxxx, jgarzik@xxxxxxxxx, Clear.Zhang@xxxxxxxxxx
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
The 'if' clause for ULI526X in tulip_mdio_write allows for
spin_unlock_irqrestore to be called twice for tp->mii_lock.  I believe
this is caused by the unintentional omission of a return at the end
of that clause.  This patch adds that return.

Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---
I'm copying Clear Zhang on this.  As the author of the patch that
added this code, he should know whether or not my intuitive fix is
actually correct... :-)

 drivers/net/tulip/media.c |    1 +
 1 files changed, 1 insertion(+)

--- linux-2.6.12-rc4/drivers/net/tulip/media.c.orig     2005-05-18 
09:19:07.392564077 -0400
+++ linux-2.6.12-rc4/drivers/net/tulip/media.c  2005-05-18 09:22:47.107779100 
-0400
@@ -174,6 +174,7 @@ void tulip_mdio_write(struct net_device 
                                break;
                }
                spin_unlock_irqrestore(&tp->mii_lock, flags);
+               return;
        }
                
        /* Establish sync by sending 32 logic ones. */
-- 
John W. Linville
linville@xxxxxxxxxxxxx

<Prev in Thread] Current Thread [Next in Thread>