From 10fd94e459086a39f7cd6eface36ca951978ba22 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Tue, 19 Mar 2013 13:41:32 +0000
Subject: [PATCH] --- yaml --- r: 361805 b: refs/heads/master c:
 fc0c0900408e05758a0df17c1924ca837fafca5e h: refs/heads/master i:   361803:
 ef07817fcd8a1060c290e707e60051ac7b6e22cb v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/renesas/sh_eth.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfe21f363c11..bcec48dd182d 100644
--- 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
index c87862812ead..bf5e3cf97c4d 100644
--- 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;
 	}