projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0340ff8
)
usb: chipidea: core: check before accessing ci_role in ci_role_show
author
Michael Thalmeier
<michael.thalmeier@hale.at>
Fri, 19 May 2017 08:32:09 +0000
(10:32 +0200)
committer
Peter Chen
<peter.chen@nxp.com>
Tue, 23 May 2017 00:36:54 +0000
(08:36 +0800)
ci_role BUGs when the role is >= CI_ROLE_END.
This is the case while the role is changing.
Signed-off-by: Michael Thalmeier <michael.thalmeier@hale.at>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
drivers/usb/chipidea/core.c
patch
|
blob
|
history
diff --git
a/drivers/usb/chipidea/core.c
b/drivers/usb/chipidea/core.c
index
9e217b1
..
fe4fe24
100644
(file)
--- a/
drivers/usb/chipidea/core.c
+++ b/
drivers/usb/chipidea/core.c
@@
-843,7
+843,10
@@
static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr,
{
struct ci_hdrc *ci = dev_get_drvdata(dev);
- return sprintf(buf, "%s\n", ci_role(ci)->name);
+ if (ci->role != CI_ROLE_END)
+ return sprintf(buf, "%s\n", ci_role(ci)->name);
+
+ return 0;
}
static ssize_t ci_role_store(struct device *dev,