ixp4xx: use the right parameter for ixp4xx_phy_disconnect
authorGabor Juhos <juhosg@openwrt.org>
Sat, 14 Aug 2010 21:07:48 +0000 (21:07 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sat, 14 Aug 2010 21:07:48 +0000 (21:07 +0000)
SVN-Revision: 22651

target/linux/ixp4xx/patches-2.6.32/205-npe_driver_separate_phy_functions.patch
target/linux/ixp4xx/patches-2.6.33/205-npe_driver_separate_phy_functions.patch
target/linux/ixp4xx/patches-2.6.34/205-npe_driver_separate_phy_functions.patch
target/linux/ixp4xx/patches-2.6.35/205-npe_driver_separate_phy_functions.patch

index b9835a012b1277e252c2cc5edc6a27b807c8b07d..9b8faeb2c5645a6cdaedc25894331871f2e0cd79 100644 (file)
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
-+      ixp4xx_phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(dev);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
index b9835a012b1277e252c2cc5edc6a27b807c8b07d..9b8faeb2c5645a6cdaedc25894331871f2e0cd79 100644 (file)
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
-+      ixp4xx_phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(dev);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
index 20109f71d9853d19b5d43fda8910f3b35ea3cf27..9aeee2dea2a33676e48963fb14b0eaea2027a44e 100644 (file)
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
-+      ixp4xx_phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(dev);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
index a4086ab1bcd06bc5a1478b4c4c7c0da2d4ba05bb..140ebb731e22a7e9a9887d1f4ddd663c8dd908ca 100644 (file)
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
  
  err_phy_dis:
 -      phy_disconnect(port->phydev);
-+      ixp4xx_phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(dev);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);
  err_free_mem:
        npe_port_tab[NPE_ID(port->id)] = NULL;
        platform_set_drvdata(pdev, NULL);