netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio_write
@ 2005-05-18 17:41 John W. Linville
  2005-05-24  4:26 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2005-05-18 17:41 UTC (permalink / raw)
  To: netdev; +Cc: jgarzik, Clear.Zhang

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@tuxdriver.com>
---
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@tuxdriver.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio_write
  2005-05-18 17:41 [patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio_write John W. Linville
@ 2005-05-24  4:26 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2005-05-24  4:26 UTC (permalink / raw)
  To: John W. Linville; +Cc: netdev, Clear.Zhang

applied

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-05-24  4:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-18 17:41 [patch 2.6.12-rc4 1/1] tulip: add return to ULI526X clause in tulip_mdio_write John W. Linville
2005-05-24  4:26 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).