Commit b9fa0292 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220422222351.1297276-4-bjorn.andersson@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcd6a517

drivers/usb/typec/mux.c

+10 −4
Original line number Diff line number Diff line
@@ -131,8 +131,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) {
@@ -338,8 +341,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) {