From 606b384bc66a350100fd88099d310c9ac059114f Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Tue, 8 Jan 2013 22:13:40 +0300
Subject: [PATCH] --- yaml --- r: 354592 b: refs/heads/master c:
 8df4ce75189807783c4bb4e4337e0f89283e6ca3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5b66fb3c45b7..4ad33b79cc5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99d17cfa3bbc6f4edb175f819af59c6b9e245e82
+refs/heads/master: 8df4ce75189807783c4bb4e4337e0f89283e6ca3
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index c293dbeb8b24..cd06166affee 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -532,15 +532,13 @@ static int omap2430_probe(struct platform_device *pdev)
 		if (!pdata) {
 			dev_err(&pdev->dev,
 				"failed to allocate musb platfrom data\n");
-			ret = -ENOMEM;
 			goto err2;
 		}
 
 		data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
 		if (!data) {
 			dev_err(&pdev->dev,
-					"failed to allocate musb board data\n");
-			ret = -ENOMEM;
+				"failed to allocate musb board data\n");
 			goto err2;
 		}