---

yaml --- r: 361805 b: refs/heads/master c: fc0c090 h: refs/heads/master i: 361803: ef07817 v: v3
git-mirror · Mar 20, 2013 · 10fd94e · 10fd94e
1 parent 208b3b3
commit 10fd94e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0582b7d15f8a7ae53dd2128b8eb01567b3fd2277
+refs/heads/master: fc0c0900408e05758a0df17c1924ca837fafca5e
diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.c b/trunk/drivers/net/ethernet/renesas/sh_eth.c
@@ -2446,6 +2446,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 		}
 		mdp->tsu_addr = ioremap(rtsu->start,
 					resource_size(rtsu));
+		if (mdp->tsu_addr == NULL) {
+			ret = -ENOMEM;
+			dev_err(&pdev->dev, "TSU ioremap failed.\n");
+			goto out_release;
+		}
 		mdp->port = devno % 2;
 		ndev->features = NETIF_F_HW_VLAN_FILTER;
 	}