From 7747bbf5282485974edcd35199b95bb1e6fa5275 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Mon, 10 May 2010 05:39:14 +0000 Subject: [PATCH] --- yaml --- r: 195157 b: refs/heads/master c: 0e995cd3d3c78377a0bc7d38236fc50e5438fabb h: refs/heads/master i: 195155: 535389181040f5d6df71aeb92b9dac03d8dbce2c v: v3 --- [refs] | 2 +- trunk/drivers/net/bfin_mac.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 30b4fab8130c..d09874a77568 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bfa0f0c9a37460ee69128da411f6d310c1c983d +refs/heads/master: 0e995cd3d3c78377a0bc7d38236fc50e5438fabb diff --git a/trunk/drivers/net/bfin_mac.c b/trunk/drivers/net/bfin_mac.c index 2538eaa891ad..39a54bad397f 100644 --- a/trunk/drivers/net/bfin_mac.c +++ b/trunk/drivers/net/bfin_mac.c @@ -1466,6 +1466,11 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) } pd = pdev->dev.platform_data; lp->mii_bus = platform_get_drvdata(pd); + if (!lp->mii_bus) { + dev_err(&pdev->dev, "Cannot get mii_bus!\n"); + rc = -ENODEV; + goto out_err_mii_bus_probe; + } lp->mii_bus->priv = ndev; rc = mii_probe(ndev); @@ -1511,6 +1516,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) out_err_mii_probe: mdiobus_unregister(lp->mii_bus); mdiobus_free(lp->mii_bus); +out_err_mii_bus_probe: peripheral_free_list(pin_req); out_err_probe_mac: platform_set_drvdata(pdev, NULL);