diff --git a/[refs] b/[refs] index 0415f5cebc0a..520ac8962cf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72e85c45b9541e1f3d233e775da1dc6f68b85867 +refs/heads/master: ec0d75518cb06261f1823fa2713fe52b9b26455e diff --git a/trunk/drivers/net/sh_eth.c b/trunk/drivers/net/sh_eth.c index 8a72a979ee71..96a629f1678e 100644 --- a/trunk/drivers/net/sh_eth.c +++ b/trunk/drivers/net/sh_eth.c @@ -1770,7 +1770,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) int ret, devno = 0; struct resource *res; struct net_device *ndev = NULL; - struct sh_eth_private *mdp; + struct sh_eth_private *mdp = NULL; struct sh_eth_plat_data *pd; /* get base addr */ @@ -1888,7 +1888,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) out_release: /* net_dev free */ - if (mdp->tsu_addr) + if (mdp && mdp->tsu_addr) iounmap(mdp->tsu_addr); if (ndev) free_netdev(ndev);