Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[karo-tx-linux.git] / drivers / net / usb / lan78xx.c

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 226668ead0d8c1ba9e6a0edf906a2122a5e74d2e..1662b7b144a879aa74434cd28ef8ca8c19d917c1 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1458,12 +1458,6 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev)
        snprintf(dev->mdiobus->id, MII_BUS_ID_SIZE, "usb-%03d:%03d",
                 dev->udev->bus->busnum, dev->udev->devnum);
 
-       dev->mdiobus->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-       if (!dev->mdiobus->irq) {
-               ret = -ENOMEM;
-               goto exit1;
-       }
-
        /* handle our own interrupt */
        for (i = 0; i < PHY_MAX_ADDR; i++)
                dev->mdiobus->irq[i] = PHY_IGNORE_INTERRUPT;
@@ -1479,13 +1473,11 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev)
        ret = mdiobus_register(dev->mdiobus);
        if (ret) {
                netdev_err(dev->net, "can't register MDIO bus\n");
-               goto exit2;
+               goto exit1;
        }
 
        netdev_dbg(dev->net, "registered mdiobus bus %s\n", dev->mdiobus->id);
        return 0;
-exit2:
-       kfree(dev->mdiobus->irq);
 exit1:
        mdiobus_free(dev->mdiobus);
        return ret;
@@ -1494,7 +1486,6 @@ exit1:
 static void lan78xx_remove_mdio(struct lan78xx_net *dev)
 {
        mdiobus_unregister(dev->mdiobus);
-       kfree(dev->mdiobus->irq);
        mdiobus_free(dev->mdiobus);
 }