git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
phy
/
fixed.c
diff --git
a/drivers/net/phy/fixed.c
b/drivers/net/phy/fixed.c
index
7e3364f
..
8613539
100644
(file)
--- a/
drivers/net/phy/fixed.c
+++ b/
drivers/net/phy/fixed.c
@@
-254,7
+254,7
@@
static int fixed_mdio_register_device(int number, int speed, int duplex)
goto device_create_fail;
}
goto device_create_fail;
}
- phydev->irq =
-1
;
+ phydev->irq =
PHY_IGNORE_INTERRUPT
;
phydev->dev.bus = &mdio_bus_type;
if(number)
phydev->dev.bus = &mdio_bus_type;
if(number)
@@
-288,9
+288,13
@@
static int fixed_mdio_register_device(int number, int speed, int duplex)
goto probe_fail;
}
goto probe_fail;
}
- device_bind_driver(&phydev->dev);
+ err = device_bind_driver(&phydev->dev);
+
up_write(&phydev->dev.bus->subsys.rwsem);
up_write(&phydev->dev.bus->subsys.rwsem);
+ if (err)
+ goto probe_fail;
+
return 0;
probe_fail:
return 0;
probe_fail:
@@
-312,8
+316,10
@@
MODULE_LICENSE("GPL");
static int __init fixed_init(void)
{
static int __init fixed_init(void)
{
+#if 0
int ret;
int duplex = 0;
int ret;
int duplex = 0;
+#endif
/* register on the bus... Not expected to be matched with anything there... */
phy_driver_register(&fixed_mdio_driver);
/* register on the bus... Not expected to be matched with anything there... */
phy_driver_register(&fixed_mdio_driver);
@@
-334,14
+340,16
@@
static int __init fixed_init(void)
*/
#ifdef CONFIG_FIXED_MII_DUPLEX
*/
#ifdef CONFIG_FIXED_MII_DUPLEX
+#if 0
duplex = 1;
#endif
duplex = 1;
#endif
+#endif
#ifdef CONFIG_FIXED_MII_100_FDX
fixed_mdio_register_device(0, 100, 1);
#endif
#ifdef CONFIG_FIXED_MII_100_FDX
fixed_mdio_register_device(0, 100, 1);
#endif
-#ifdef CONFI
X
_FIXED_MII_10_FDX
+#ifdef CONFI
G
_FIXED_MII_10_FDX
fixed_mdio_register_device(0, 10, 1);
#endif
return 0;
fixed_mdio_register_device(0, 10, 1);
#endif
return 0;