提交 5ceb7b45 编写于 作者: B Bjorn Andersson 提交者: Zheng Zengkai

usb: typec: mux: Check dev_set_name() return value

stable inclusion
from stable-v5.10.122
commit 6f01c0fb8e44b7ac9dad9e728e44157cbf7b3d4a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5W6OE

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

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

[ Upstream commit b9fa0292 ]

It's possible that dev_set_name() returns -ENOMEM, catch and handle this.

Fixes: 3370db35 ("usb: typec: Registering real device entries for the muxes")
Reported-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: NHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: NBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220422222351.1297276-4-bjorn.andersson@linaro.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 938f32ab
...@@ -127,8 +127,11 @@ typec_switch_register(struct device *parent, ...@@ -127,8 +127,11 @@ typec_switch_register(struct device *parent,
sw->dev.class = &typec_mux_class; sw->dev.class = &typec_mux_class;
sw->dev.type = &typec_switch_dev_type; sw->dev.type = &typec_switch_dev_type;
sw->dev.driver_data = desc->drvdata; sw->dev.driver_data = desc->drvdata;
dev_set_name(&sw->dev, "%s-switch", ret = dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev_name(parent));
desc->name ? desc->name : dev_name(parent)); if (ret) {
put_device(&sw->dev);
return ERR_PTR(ret);
}
ret = device_add(&sw->dev); ret = device_add(&sw->dev);
if (ret) { if (ret) {
...@@ -331,8 +334,11 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc) ...@@ -331,8 +334,11 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
mux->dev.class = &typec_mux_class; mux->dev.class = &typec_mux_class;
mux->dev.type = &typec_mux_dev_type; mux->dev.type = &typec_mux_dev_type;
mux->dev.driver_data = desc->drvdata; mux->dev.driver_data = desc->drvdata;
dev_set_name(&mux->dev, "%s-mux", ret = dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_name(parent));
desc->name ? desc->name : dev_name(parent)); if (ret) {
put_device(&mux->dev);
return ERR_PTR(ret);
}
ret = device_add(&mux->dev); ret = device_add(&mux->dev);
if (ret) { if (ret) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册