NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: typec: Iterate pds array when showing the pd list

Browse source 
commit 4b642dc9829507e4afabc03d32a18abbdb192c5e upstream.

The pointers of each usb_power_delivery handles are stored in "pds"
array returned from the pd_get ops but not in the adjacent memory
calculated from "pd". Get the handles from "pds" array directly instead
of deriving them from "pd".

Fixes: a7cff92f06 ("usb: typec: USB Power Delivery helpers for ports and partners")
Cc: stable@vger.kernel.org
Signed-off-by: Kyle Tso <kyletso@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230623151036.3955013-3-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kyle Tso 2023-06-23 23:10:35 +08:00 • committed by Greg Kroah-Hartman
parent 59feda7f38
commit 9e4c1e68bf
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/typec/class.c
View file

@ -1258,8 +1258,7 @@ static ssize_t select_usb_power_delivery_show(struct device *dev,
{ {
struct typec_port *port = to_typec_port(dev); struct typec_port *port = to_typec_port(dev);
struct usb_power_delivery **pds; struct usb_power_delivery **pds;
struct usb_power_delivery *pd; int i, ret = 0;
int ret = 0;
if (!port->ops || !port->ops->pd_get) if (!port->ops || !port->ops->pd_get)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1268,11 +1267,11 @@ static ssize_t select_usb_power_delivery_show(struct device *dev,
if (!pds) if (!pds)
return 0; return 0;
for (pd = pds[0]; pd; pd++) { for (i = 0; pds[i]; i++) {
if (pd == port->pd) if (pds[i] == port->pd)
ret += sysfs_emit(buf + ret, "[%s] ", dev_name(&pd->dev)); ret += sysfs_emit(buf + ret, "[%s] ", dev_name(&pds[i]->dev));
else else
ret += sysfs_emit(buf + ret, "%s ", dev_name(&pd->dev)); ret += sysfs_emit(buf + ret, "%s ", dev_name(&pds[i]->dev));
} }
buf[ret - 1] = '\n'; buf[ret - 1] = '\n';