summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPawel Laszczak <pawell@cadence.com>2020-07-13 13:05:53 +0300
committerFelipe Balbi <balbi@kernel.org>2020-07-24 16:45:13 +0300
commitf41ca26b8b178d0b7005c9bfeda88814179203b3 (patch)
tree47caf65629bd5332c4fd58dc7cda2988165460d8 /drivers
parent5c2cf30f14cc3973f2d288e33b0153f5d9a357fb (diff)
downloadlinux-f41ca26b8b178d0b7005c9bfeda88814179203b3.tar.xz
usb: cdns3: core: removed overwriting some error code
Some error code can be preserved, so we can remove overwriting error code returned by some functions. Signed-off-by: Pawel Laszczak <pawell@cadence.com> Reviewed-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Felipe Balbi <balbi@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/cdns3/core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 8e3996f211a8..72885c5edb09 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -347,7 +347,6 @@ static int cdns3_role_set(struct usb_role_switch *sw, enum usb_role role)
case USB_ROLE_HOST:
break;
default:
- ret = -EPERM;
goto pm_put;
}
}
@@ -358,17 +357,14 @@ static int cdns3_role_set(struct usb_role_switch *sw, enum usb_role role)
case USB_ROLE_DEVICE:
break;
default:
- ret = -EPERM;
goto pm_put;
}
}
cdns3_role_stop(cdns);
ret = cdns3_role_start(cdns, role);
- if (ret) {
+ if (ret)
dev_err(cdns->dev, "set role %d has failed\n", role);
- ret = -EPERM;
- }
pm_put:
pm_runtime_put_sync(cdns->dev);
@@ -393,7 +389,7 @@ static int cdns3_probe(struct platform_device *pdev)
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret) {
dev_err(dev, "error setting dma mask: %d\n", ret);
- return -ENODEV;
+ return ret;
}
cdns = devm_kzalloc(dev, sizeof(*cdns), GFP_KERNEL);