summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXu Yang <xu.yang_2@nxp.com>2023-03-17 14:15:15 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-04-05 11:15:37 +0200
commit7a95f8c7a43a841d6104e0dd60a04c3f826f4095 (patch)
tree70e9beffa0a86407adeb631af56a40a99596b00a
parent84e13235e08941ce37aa9ee238b6dd007170f0fc (diff)
downloadlinux-7a95f8c7a43a841d6104e0dd60a04c3f826f4095.tar.gz
linux-7a95f8c7a43a841d6104e0dd60a04c3f826f4095.tar.bz2
linux-7a95f8c7a43a841d6104e0dd60a04c3f826f4095.zip
usb: chipdea: core: fix return -EINVAL if request role is the same with current role
commit 3670de80678961eda7fa2220883fc77c16868951 upstream. It should not return -EINVAL if the request role is the same with current role, return non-error and without do anything instead. Fixes: a932a8041ff9 ("usb: chipidea: core: add sysfs group") cc: <stable@vger.kernel.org> Acked-by: Peter Chen <peter.chen@kernel.org> Signed-off-by: Xu Yang <xu.yang_2@nxp.com> Link: https://lore.kernel.org/r/20230317061516.2451728-1-xu.yang_2@nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/chipidea/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index c13f9a153a5c..669416d90a48 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -872,9 +872,12 @@ static ssize_t role_store(struct device *dev,
strlen(ci->roles[role]->name)))
break;
- if (role == CI_ROLE_END || role == ci->role)
+ if (role == CI_ROLE_END)
return -EINVAL;
+ if (role == ci->role)
+ return n;
+
pm_runtime_get_sync(dev);
disable_irq(ci->irq);
ci_role_stop(ci);