apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2009-11-12 10:59:04 +11:00
parent e0ea8b2c06 aa021baa32
commit 0526484aa3
590 changed files with 9034 additions and 8123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/platforms/82xx/ep8248e.c
+14 -1
View File
@@ -132,12 +132,25 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
return -ENOMEM;
bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
if (bus->irq == NULL) {
ret = -ENOMEM;
goto err_free_bus;
}
bus->name = "ep8248e-mdio-bitbang";
bus->parent = &ofdev->dev;
snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
return of_mdiobus_register(bus, ofdev->node);
ret = of_mdiobus_register(bus, ofdev->node);
if (ret)
goto err_free_irq;
return 0;
err_free_irq:
kfree(bus->irq);
err_free_bus:
free_mdio_bitbang(bus);
return ret;
}
static int ep8248e_mdio_remove(struct of_device *ofdev)