Commit 4b642dc9 authored by Kyle Tso's avatar Kyle Tso Committed by Greg Kroah-Hartman

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

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: a7cff92f ("usb: typec: USB Power Delivery helpers for ports and partners")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKyle Tso <kyletso@google.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230623151036.3955013-3-kyletso@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b33ebb24
......@@ -1277,8 +1277,7 @@ static ssize_t select_usb_power_delivery_show(struct device *dev,
{
struct typec_port *port = to_typec_port(dev);
struct usb_power_delivery **pds;
struct usb_power_delivery *pd;
int ret = 0;
int i, ret = 0;
if (!port->ops || !port->ops->pd_get)
return -EOPNOTSUPP;
......@@ -1287,11 +1286,11 @@ static ssize_t select_usb_power_delivery_show(struct device *dev,
if (!pds)
return 0;
for (pd = pds[0]; pd; pd++) {
if (pd == port->pd)
ret += sysfs_emit(buf + ret, "[%s] ", dev_name(&pd->dev));
for (i = 0; pds[i]; i++) {
if (pds[i] == port->pd)
ret += sysfs_emit(buf + ret, "[%s] ", dev_name(&pds[i]->dev));
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';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment