From 3f011e220a00a31e06f6e2228bbf83c04279b665 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 11 Jan 2012 23:55:10 +0000 Subject: [PATCH] --- yaml --- r: 284339 b: refs/heads/master c: 25cecd7e355bf90b8fea039bd06947bb3234e77d h: refs/heads/master i: 284337: 26fc5909bda13a793f29c8a3660d81f0e584fec0 284335: a0411dda5b6de05fcfb76690ceb938ea33acefde v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77f50e5c95bc..8a189479c9f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20d4369b6892159895d6136946e692eaf29e8413 +refs/heads/master: 25cecd7e355bf90b8fea039bd06947bb3234e77d diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 7b1594f4944e..1ac83243649a 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -62,7 +62,7 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) priv = stmmac_dvr_probe(&(pdev->dev), plat_dat); if (!priv) { pr_err("%s: main drivr probe failed", __func__); - goto out_release_region; + goto out_unmap; } priv->ioaddr = addr;