Skip to content

Commit

Permalink
phy: Fix error handling in tegra_xusb_port_init
Browse files Browse the repository at this point in the history
If device_add() fails, do not use device_unregister() for error
handling. device_unregister() consists two functions: device_del() and
put_device(). device_unregister() should only be called after
device_add() succeeded because device_del() undoes what device_add()
does if successful. Change device_unregister() to put_device() call
before returning from the function.

As comment of device_add() says, 'if device_add() succeeds, you should
call device_del() when you want to get rid of it. If device_add() has
not succeeded, use only put_device() to drop the reference count'.

Found by code review.

Cc: stable@vger.kernel.org
Fixes: 53d2a71 ("phy: Add Tegra XUSB pad controller support")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20250303072739.3874987-1-make24@iscas.ac.cn
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Ma Ke authored and Vinod Koul committed May 14, 2025
1 parent 86e7084 commit b2ea5f4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/phy/tegra/xusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,16 +548,16 @@ static int tegra_xusb_port_init(struct tegra_xusb_port *port,

err = dev_set_name(&port->dev, "%s-%u", name, index);
if (err < 0)
goto unregister;
goto put_device;

err = device_add(&port->dev);
if (err < 0)
goto unregister;
goto put_device;

return 0;

unregister:
device_unregister(&port->dev);
put_device:
put_device(&port->dev);
return err;
}

Expand Down

0 comments on commit b2ea5f4

Please sign in to comment.