summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLothar Waßmann2013-08-14 11:44:00 +0200
committerGreg Kroah-Hartman2013-08-14 21:34:16 +0200
commit3b1280ca4b1743de3be04e9dd5907ec79d72483d (patch)
tree297af2d6096caee4983f8ed09c1e71c54b15d624
parentusb: chipidea: ci_hdrc_imx: remove an unsolicited module_put() call from ci_h... (diff)
downloadkernel-qcow2-linux-3b1280ca4b1743de3be04e9dd5907ec79d72483d.tar.gz
kernel-qcow2-linux-3b1280ca4b1743de3be04e9dd5907ec79d72483d.tar.xz
kernel-qcow2-linux-3b1280ca4b1743de3be04e9dd5907ec79d72483d.zip
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>
-rw-r--r--drivers/usb/chipidea/core.c1
1 files changed, 0 insertions, 1 deletions
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;
}