tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

usb: typec: Set port->pd before adding device for typec_port

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>
Link: https://lore.kernel.org/r/20230623151036.3955013-2-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Kyle Tso and committed by
Greg Kroah-Hartman b33ebb24 da6d91ed

+3 -1
+3 -1
drivers/usb/typec/class.c
··· 2288 2288 return ERR_PTR(ret); 2289 2289 } 2290 2290 2291 + port->pd = cap->pd; 2292 + 2291 2293 ret = device_add(&port->dev); 2292 2294 if (ret) { 2293 2295 dev_err(parent, "failed to register port (%d)\n", ret); ··· 2297 2295 return ERR_PTR(ret); 2298 2296 } 2299 2297 2300 - ret = typec_port_set_usb_power_delivery(port, cap->pd); 2298 + ret = usb_power_delivery_link_device(port->pd, &port->dev); 2301 2299 if (ret) { 2302 2300 dev_err(&port->dev, "failed to link pd\n"); 2303 2301 device_unregister(&port->dev);