diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2005-05-18 13:41:33 -0400 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-05-24 00:26:12 -0400 |
| commit | 9092f46b5aed4515d9a427d5dab3be1584851f07 (patch) | |
| tree | 3723469c5f2af23e29e7c25036d1cdca893f90b9 /drivers/net/tulip/media.c | |
| parent | [PATCH] driver core: restore event order for device_add() (diff) | |
| download | linux-dev-9092f46b5aed4515d9a427d5dab3be1584851f07.tar.xz linux-dev-9092f46b5aed4515d9a427d5dab3be1584851f07.zip | |
[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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tulip/media.c | 1 |
1 files changed, 1 insertions, 0 deletions
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. */ |