Commit 3c950c4d authored Apr 22, 2022 by Bjorn Andersson Committed by Lee Jones Jan 23, 2024

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



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

Bug: 254441685
Fixes: 3370db35193b ("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>
(cherry picked from commit b9fa0292490db39d6542f514117333d366ec0011)
[Lee: dev_set_name() line was a little different - trivial fix-up]
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I3bfcc613b7f6b08d01f1aab9dce71a05abe25bf6

parent 9944d013

drivers/usb/typec/mux.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,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", dev_name(parent));
		ret = dev_set_name(&sw->dev, "%s-switch", dev_name(parent));
		if (ret) {
		put_device(&sw->dev);
		return ERR_PTR(ret);
		}

		ret = device_add(&sw->dev);
		if (ret) {
		@@ -327,7 +331,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", dev_name(parent));
		ret = dev_set_name(&mux->dev, "%s-mux", dev_name(parent));
		if (ret) {
		put_device(&mux->dev);
		return ERR_PTR(ret);
		}

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