From 2a14648b0a603285f71d524d577a6e14b2aef99e Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Tue, 14 Aug 2012 08:47:38 +0200
Subject: [PATCH] --- yaml --- r: 325830 b: refs/heads/master c:
 ec03ad85486e94f133a721a5d6fd3aaef1176c46 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/host/ehci-platform.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0a34e6d36901..610cf6b0085c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47282502933e94a2e443fab36c412191fc3ed6ce
+refs/heads/master: ec03ad85486e94f133a721a5d6fd3aaef1176c46
diff --git a/trunk/drivers/usb/host/ehci-platform.c b/trunk/drivers/usb/host/ehci-platform.c
index 91acdde8d21f..764e0100b6f4 100644
--- a/trunk/drivers/usb/host/ehci-platform.c
+++ b/trunk/drivers/usb/host/ehci-platform.c
@@ -128,8 +128,10 @@ static int __devinit ehci_platform_probe(struct platform_device *dev)
 	}
 
 	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
-	if (!hcd->regs)
+	if (!hcd->regs) {
+		err = -ENOMEM;
 		goto err_release_region;
+	}
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err)
 		goto err_iounmap;