提交 92707095 编写于 作者: S Sean Anderson 提交者: Zheng Zengkai

usb: ulpi: Call of_node_put correctly

stable inclusion
from stable-v5.10.101
commit 2a17bd9f52104fc5c023499cf4c9bea3f10f2b1c
bugzilla: https://gitee.com/openeuler/kernel/issues/I5669Z

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2a17bd9f52104fc5c023499cf4c9bea3f10f2b1c

--------------------------------

commit 0a907ee9 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: ef6a7bcf ("usb: ulpi: Support device discovery via DT")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: NHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: NSean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20220127190004.1446909-3-sean.anderson@seco.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 65544caf
...@@ -250,12 +250,16 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) ...@@ -250,12 +250,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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册