Skip to content

Commit

Permalink
usb: typec: mux: Check dev_set_name() return value
Browse files Browse the repository at this point in the history
[ Upstream commit b9fa029 ]

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

Fixes: 3370db3 ("usb: typec: Registering real device entries for the muxes")
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220422222351.1297276-4-bjorn.andersson@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
andersson authored and gregkh committed Jun 14, 2022
1 parent 7027c89 commit 6f01c0f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/usb/typec/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,11 @@ typec_switch_register(struct device *parent,
sw->dev.class = &typec_mux_class;
sw->dev.type = &typec_switch_dev_type;
sw->dev.driver_data = desc->drvdata;
dev_set_name(&sw->dev, "%s-switch",
desc->name ? desc->name : dev_name(parent));
ret = dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev_name(parent));
if (ret) {
put_device(&sw->dev);
return ERR_PTR(ret);
}

ret = device_add(&sw->dev);
if (ret) {
Expand Down Expand Up @@ -331,8 +334,11 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
mux->dev.class = &typec_mux_class;
mux->dev.type = &typec_mux_dev_type;
mux->dev.driver_data = desc->drvdata;
dev_set_name(&mux->dev, "%s-mux",
desc->name ? desc->name : dev_name(parent));
ret = dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_name(parent));
if (ret) {
put_device(&mux->dev);
return ERR_PTR(ret);
}

ret = device_add(&mux->dev);
if (ret) {
Expand Down

0 comments on commit 6f01c0f

Please sign in to comment.