Title: [9123] trunk/drivers/net/bfin_mac.c: blackfin: emac: always set phy_mask
- Revision
- 9123
- Author
- sonicz
- Date
- 2010-09-06 03:21:59 -0400 (Mon, 06 Sep 2010)
Log Message
blackfin: emac: always set phy_mask
even if failing to malloc miibus->irq
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (9122 => 9123)
--- trunk/drivers/net/bfin_mac.c 2010-09-03 10:04:58 UTC (rev 9122)
+++ trunk/drivers/net/bfin_mac.c 2010-09-06 07:21:59 UTC (rev 9123)
@@ -1684,6 +1684,9 @@
miibus->parent = &pdev->dev;
miibus->name = "bfin_mii_bus";
+ if (mii_bus_pd)
+ miibus->phy_mask = mii_bus_pd->phy_mask;
+
snprintf(miibus->id, MII_BUS_ID_SIZE, "0");
miibus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
if (miibus->irq != NULL) {
@@ -1691,7 +1694,6 @@
miibus->irq[i] = PHY_POLL;
if (mii_bus_pd) {
- miibus->phy_mask = mii_bus_pd->phy_mask;
if (mii_bus_pd->phydev_number > 0 &&
mii_bus_pd->phydev_number <= PHY_MAX_ADDR) {
for (i = 0; i < mii_bus_pd->phydev_number; ++i) {
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
