| Message ID | 20230623151036.3955013-2-kyletso@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b33ebb2415e7e0a55ee3d049c2890d3a3e3805b6 |
| Headers | show |
| Series | Some fixes for select_usb_power_delivery | expand |
On Fri, Jun 23, 2023 at 11:10:34PM +0800, Kyle Tso wrote: > When calling device_add in the registration of typec_port, it will do > the NULL check on usb_power_delivery handle in typec_port for the > visibility of the device attributes. It is always NULL because port->pd > is set in typec_port_set_usb_power_delivery which is later than the > device_add call. > > Set port->pd before device_add and only link the device after that. > > Fixes: a7cff92f0635 ("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> thanks,
diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index faa184ae3dac..3b30948bf4b0 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -2288,6 +2288,8 @@ struct typec_port *typec_register_port(struct device *parent, return ERR_PTR(ret); } + port->pd = cap->pd; + ret = device_add(&port->dev); if (ret) { dev_err(parent, "failed to register port (%d)\n", ret); @@ -2295,7 +2297,7 @@ struct typec_port *typec_register_port(struct device *parent, return ERR_PTR(ret); } - ret = typec_port_set_usb_power_delivery(port, cap->pd); + ret = usb_power_delivery_link_device(port->pd, &port->dev); if (ret) { dev_err(&port->dev, "failed to link pd\n"); device_unregister(&port->dev);
When calling device_add in the registration of typec_port, it will do the NULL check on usb_power_delivery handle in typec_port for the visibility of the device attributes. It is always NULL because port->pd is set in typec_port_set_usb_power_delivery which is later than the device_add call. Set port->pd before device_add and only link the device after that. Fixes: a7cff92f0635 ("usb: typec: USB Power Delivery helpers for ports and partners") Cc: stable@vger.kernel.org Signed-off-by: Kyle Tso <kyletso@google.com> --- update v2: - Add "Cc: stable@vger.kernel.org" drivers/usb/typec/class.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)