From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 14 Aug 2013 09:44:00 +0000 (+0300)
Subject: usb: chipidea: don't clobber return value of ci_role_start()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b1280ca4b1743de3be04e9dd5907ec79d72483d;p=linux-beck.git

usb: chipidea: don't clobber return value of ci_role_start()

If a role fails to start, propagate the error code up the call stack
from probe.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index a5b3774bb223..2400b7f87f97 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -497,7 +497,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 	ret = ci_role_start(ci, ci->role);
 	if (ret) {
 		dev_err(dev, "can't start %s role\n", ci_role(ci)->name);
-		ret = -ENODEV;
 		goto rm_wq;
 	}