ar71xx: merge latest ag71xx changes from trunk, fix wrong argument to phy_mii_ioctl()

[openwrt-10.03/.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_phy.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index d70aaf0921fdcb714808a2c08ecdae6e50d91770..75500277f4cda0bcd65935960c3e7542b65b08ae 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -48,9 +48,9 @@ void ag71xx_phy_start(struct ag71xx *ag)
 
        if (ag->phy_dev) {
                phy_start(ag->phy_dev);
 
        if (ag->phy_dev) {
                phy_start(ag->phy_dev);

+       } else if (pdata->has_ar7240_switch) {
+               ag71xx_ar7240_start(ag);

        } else {
        } else {

-               if (pdata->has_ar7240_switch)
-                       ag71xx_ar7240_start(ag);

                ag->link = 1;
                ag71xx_link_adjust(ag);
        }
                ag->link = 1;
                ag71xx_link_adjust(ag);
        }


@@ -217,7 +217,7 @@ int __devinit ag71xx_phy_connect(struct ag71xx *ag)
        return ag71xx_phy_connect_fixed(ag);
 }
 
        return ag71xx_phy_connect_fixed(ag);
 }
 

-void __devexit ag71xx_phy_disconnect(struct ag71xx *ag)
+void ag71xx_phy_disconnect(struct ag71xx *ag)

 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);