usb: typec: tipd: Fix spurious fwnode_handle_put in error path
authorSven Peter <sven@svenpeter.dev>
Mon, 14 Nov 2022 17:44:47 +0000 (18:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:39 +0000 (13:32 +0100)
[ Upstream commit 782c70edc4852a5d39be12377a85501546236212 ]

The err_role_put error path always calls fwnode_handle_put to release
the fwnode. This path can be reached after probe itself has already
released that fwnode though. Fix that by moving fwnode_handle_put in the
happy path to the very end.

Fixes: 18a6c866bb19 ("usb: typec: tps6598x: Add USB role switching logic")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20221114174449.34634-2-sven@svenpeter.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/typec/tipd/core.c

index 83a7a82..5905931 100644 (file)
@@ -821,7 +821,6 @@ static int tps6598x_probe(struct i2c_client *client)
                ret = PTR_ERR(tps->port);
                goto err_role_put;
        }
-       fwnode_handle_put(fwnode);
 
        if (status & TPS_STATUS_PLUG_PRESENT) {
                ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &tps->pwr_status);
@@ -845,6 +844,7 @@ static int tps6598x_probe(struct i2c_client *client)
        }
 
        i2c_set_clientdata(client, tps);
+       fwnode_handle_put(fwnode);
 
        return 0;