Skip to content

Commit

Permalink
usb: typec: Set port->pd before adding device for typec_port
Browse files Browse the repository at this point in the history
commit b33ebb2 upstream.

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>
  • Loading branch information
kyletsoadl authored and gregkh committed Aug 3, 2023
1 parent 41c60ab commit 54c6d5f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/usb/typec/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -2288,14 +2288,16 @@ 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);
put_device(&port->dev);
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);
Expand Down

0 comments on commit 54c6d5f

Please sign in to comment.