From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 18 May 2005 17:41:33 +0000 (-0400)
Subject: [PATCH] tulip: add return to ULI526X clause in tulip_mdio_write
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9092f46b5aed4515d9a427d5dab3be1584851f07;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[PATCH] tulip: add return to ULI526X clause in tulip_mdio_write

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>
---

diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index edae09a4b021..919c40cd635c 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -174,6 +174,7 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
 				break;
 		}
 		spin_unlock_irqrestore(&tp->mii_lock, flags);
+		return;
 	}
 		
 	/* Establish sync by sending 32 logic ones. */