| Message ID | 20240311144500.3694849-1-kyletso@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 893cd9469c68a89a34956121685617dbb37497b1 |
| Headers | show |
| Series | [v1] usb: typec: tcpm: Correct port source pdo array in pd_set callback | expand |
On Mon, Mar 11, 2024 at 10:45:00PM +0800, Kyle Tso wrote: > In tcpm_pd_set, the array of port source capabilities is port->src_pdo, > not port->snk_pdo. > > Fixes: cd099cde4ed2 ("usb: typec: tcpm: Support multiple capabilities") > Cc: stable@vger.kernel.org > Signed-off-by: Kyle Tso <kyletso@google.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/tcpm/tcpm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 3d505614bff1..9485f6373de4 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -6858,7 +6858,7 @@ static int tcpm_pd_set(struct typec_port *p, struct usb_power_delivery *pd) > > if (data->source_desc.pdo[0]) { > for (i = 0; i < PDO_MAX_OBJECTS && data->source_desc.pdo[i]; i++) > - port->snk_pdo[i] = data->source_desc.pdo[i]; > + port->src_pdo[i] = data->source_desc.pdo[i]; > port->nr_src_pdo = i + 1; > } > > -- > 2.44.0.278.ge034bb2e1d-goog
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 3d505614bff1..9485f6373de4 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -6858,7 +6858,7 @@ static int tcpm_pd_set(struct typec_port *p, struct usb_power_delivery *pd) if (data->source_desc.pdo[0]) { for (i = 0; i < PDO_MAX_OBJECTS && data->source_desc.pdo[i]; i++) - port->snk_pdo[i] = data->source_desc.pdo[i]; + port->src_pdo[i] = data->source_desc.pdo[i]; port->nr_src_pdo = i + 1; }
In tcpm_pd_set, the array of port source capabilities is port->src_pdo, not port->snk_pdo. Fixes: cd099cde4ed2 ("usb: typec: tcpm: Support multiple capabilities") Cc: stable@vger.kernel.org Signed-off-by: Kyle Tso <kyletso@google.com> --- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)