X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fphy%2Ffixed.c;h=096d4a100bf2d266c368de248e24e500972e2e63;hb=359f2d17e32b32f53577375f83fb06d34e31bfe8;hp=19f7ee63276fb56a6ad4f64e0adf3200bf049a59;hpb=250d375d1da45a5e08ab8baf5eaa7eb258afd82b;p=powerpc.git

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 19f7ee6327..096d4a100b 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -13,7 +13,6 @@
  * option) any later version.
  *
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -255,7 +254,7 @@ static int fixed_mdio_register_device(int number, int speed, int duplex)
 		goto device_create_fail;
 	}
 
-	phydev->irq = -1;
+	phydev->irq = PHY_IGNORE_INTERRUPT;
 	phydev->dev.bus = &mdio_bus_type;
 
 	if(number)
@@ -289,9 +288,13 @@ static int fixed_mdio_register_device(int number, int speed, int duplex)
 		goto probe_fail;
 	}
 
-	device_bind_driver(&phydev->dev);
+	err = device_bind_driver(&phydev->dev);
+
 	up_write(&phydev->dev.bus->subsys.rwsem);
 
+	if (err)
+		goto probe_fail;
+
 	return 0;
 
 probe_fail: