summaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.h
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-05-02 13:00:30 -0500
committerJeff Garzik <jgarzik@redhat.com>2008-05-06 12:01:34 -0400
commitf162b9d58273a9a5747211133c8ccb2de5cf5ff2 (patch)
tree1ee677ebfe4cc3ecf4e2b9deffda26a264c1426c /drivers/net/gianfar.h
parent569f0c4d909c7f73de634abcdc36344cb72de36a (diff)
downloadblackbird-op-linux-f162b9d58273a9a5747211133c8ccb2de5cf5ff2.tar.gz
blackbird-op-linux-f162b9d58273a9a5747211133c8ccb2de5cf5ff2.zip
gianfar: Fix a locking bug in gianfar's sysfs code
During sparse cleanup, found a locking bug. Some of the sysfs functions were acquiring a lock, and then returning in the event of an error. We rearrange the code so that the lock is released in error conditions, too. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/gianfar.h')
-rw-r--r--drivers/net/gianfar.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index fd487be3993e..27f37c81e52c 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -782,5 +782,8 @@ extern void gfar_halt(struct net_device *dev);
extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,
int enable, u32 regnum, u32 read);
void gfar_init_sysfs(struct net_device *dev);
+int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,
+ int regnum, u16 value);
+int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);
#endif /* __GIANFAR_H */
OpenPOWER on IntegriCloud