From: Heikki Krogerus Date: Mon, 4 Nov 2019 14:24:27 +0000 (+0300) Subject: usb: typec: hd3ss3220: Give the connector fwnode to the port device X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=24dab5380512874e323629350dd07defff09f1a7;p=linux.git usb: typec: hd3ss3220: Give the connector fwnode to the port device The driver already finds the node in order to get reference to the USB role switch. Signed-off-by: Heikki Krogerus Tested-by: Biju Das Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20191104142435.29960-11-heikki.krogerus@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index db09fa0d85f2c..323dfa8160ab0 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -178,15 +178,17 @@ static int hd3ss3220_probe(struct i2c_client *client, return -ENODEV; hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector); - fwnode_handle_put(connector); - if (IS_ERR(hd3ss3220->role_sw)) - return PTR_ERR(hd3ss3220->role_sw); + if (IS_ERR(hd3ss3220->role_sw)) { + ret = PTR_ERR(hd3ss3220->role_sw); + goto err_put_fwnode; + } typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE; typec_cap.driver_data = hd3ss3220; typec_cap.type = TYPEC_PORT_DRP; typec_cap.data = TYPEC_PORT_DRD; typec_cap.ops = &hd3ss3220_ops; + typec_cap.fwnode = connector; hd3ss3220->port = typec_register_port(&client->dev, &typec_cap); if (IS_ERR(hd3ss3220->port)) { @@ -220,6 +222,8 @@ static int hd3ss3220_probe(struct i2c_client *client, if (ret < 0) goto err_unreg_port; + fwnode_handle_put(connector); + dev_info(&client->dev, "probed revision=0x%x\n", ret); return 0; @@ -227,6 +231,8 @@ err_unreg_port: typec_unregister_port(hd3ss3220->port); err_put_role: usb_role_switch_put(hd3ss3220->role_sw); +err_put_fwnode: + fwnode_handle_put(connector); return ret; }