Skip to content

Commit b33ebb2

Browse files
kyletsoadlgregkh
authored andcommitted
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: a7cff92 ("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>
1 parent da6d91e commit b33ebb2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/usb/typec/class.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2288,14 +2288,16 @@ struct typec_port *typec_register_port(struct device *parent,
22882288
return ERR_PTR(ret);
22892289
}
22902290

2291+
port->pd = cap->pd;
2292+
22912293
ret = device_add(&port->dev);
22922294
if (ret) {
22932295
dev_err(parent, "failed to register port (%d)\n", ret);
22942296
put_device(&port->dev);
22952297
return ERR_PTR(ret);
22962298
}
22972299

2298-
ret = typec_port_set_usb_power_delivery(port, cap->pd);
2300+
ret = usb_power_delivery_link_device(port->pd, &port->dev);
22992301
if (ret) {
23002302
dev_err(&port->dev, "failed to link pd\n");
23012303
device_unregister(&port->dev);

0 commit comments

Comments
 (0)