iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: ulpi: Call of_node_put correctly

Browse Source 
commit 0a907ee9d9 upstream.

of_node_put should always be called on device nodes gotten from
of_get_*. Additionally, it should only be called after there are no
remaining users. To address the first issue, call of_node_put if later
steps in ulpi_register fail. To address the latter, call put_device if
device_register fails, which will call ulpi_dev_release if necessary.

Fixes: ef6a7bcfb0 ("usb: ulpi: Support device discovery via DT")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20220127190004.1446909-3-sean.anderson@seco.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sean Anderson
2022-01-27 14:00:03 -05:00
committed by Greg Kroah-Hartman
parent 4395107033
commit d7aa226d3b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/common/ulpi.c
View File

@ -249,12 +249,16 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
return ret; return ret;
ret = ulpi_read_id(ulpi); ret = ulpi_read_id(ulpi);
if (ret) if (ret) {
of_node_put(ulpi->dev.of_node);
return ret; return ret;
}
ret = device_register(&ulpi->dev); ret = device_register(&ulpi->dev);
if (ret) if (ret) {
put_device(&ulpi->dev);
return ret; return ret;
}
dev_dbg(&ulpi->dev, "registered ULPI PHY: vendor %04x, product %04x\n", dev_dbg(&ulpi->dev, "registered ULPI PHY: vendor %04x, product %04x\n",
ulpi->id.vendor, ulpi->id.product); ulpi->id.vendor, ulpi->id.product);