ramips: request_irq prior to dma allocation, and handle the case if it fails

[openwrt.git] / target / linux / ixp4xx / patches-2.6.30 / 203-npe_driver_mask_phy_features.patch

diff --git a/target/linux/ixp4xx/patches-2.6.30/203-npe_driver_mask_phy_features.patch b/target/linux/ixp4xx/patches-2.6.30/203-npe_driver_mask_phy_features.patch
index ac0582a..aa88939 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.30/203-npe_driver_mask_phy_features.patch
+++ b/target/linux/ixp4xx/patches-2.6.30/203-npe_driver_mask_phy_features.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -1220,6 +1220,10 @@ static int __devinit eth_init_one(struct
-               return PTR_ERR(port->phydev);
-       }
+@@ -1215,6 +1215,10 @@ static int __devinit eth_init_one(struct
+       if ((err = IS_ERR(port->phydev)))
+               goto err_free_mem;

  
 +      /* mask with MAC supported features */
 +      port->phydev->supported &= PHY_BASIC_FEATURES;
  
 +      /* mask with MAC supported features */
 +      port->phydev->supported &= PHY_BASIC_FEATURES;


@@ -10,4 +10,4 @@
 +
        port->phydev->irq = PHY_POLL;
  
 +
        port->phydev->irq = PHY_POLL;
  

-       printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
+       if ((err = register_netdev(dev)))