usb: usb251xb: fix regulator probe and error handling (f06947f2) · Commits · 戴 / test

Commit ("usb: usb251xb: add vdd supply support") didn't covered the non-DT use-case and so the regualtor_enable() call during probe will fail on those platforms. Also the commit didn't handled the error case correctly. Move devm_regulator_get() out of usb251xb_get_ofdata() to address the 1st issue. This can be done without worries because devm_regulator_get() handles the non-DT use-case too. Add devm_add_action_or_reset() to address the 2nd bug. Fixes: ("usb: usb251xb: add vdd supply support") Signed-off-by:

Marco Felsch <m.felsch@pengutronix.de> Cc: stable <stable@vger.kernel.org> Acked-by:

Richard Leitner <richard.leitner@skidata.com> Link: https://lore.kernel.org/r/20200226072644.18490-1-m.felsch@pengutronix.de Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/misc/usb251xb.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -424,10 +424,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
		return err;
		}

		hub->vdd = devm_regulator_get(dev, "vdd");
		if (IS_ERR(hub->vdd))
		return PTR_ERR(hub->vdd);

		if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1))
		hub->vendor_id = USB251XB_DEF_VENDOR_ID;

		@@ -640,6 +636,13 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
		}
		#endif /* CONFIG_OF */

		static void usb251xb_regulator_disable_action(void *data)
		{
		struct usb251xb *hub = data;

		regulator_disable(hub->vdd);
		}

		static int usb251xb_probe(struct usb251xb *hub)
		{
		struct device *dev = hub->dev;
		@@ -676,10 +679,19 @@ static int usb251xb_probe(struct usb251xb *hub)
		if (err)
		return err;

		hub->vdd = devm_regulator_get(dev, "vdd");
		if (IS_ERR(hub->vdd))
		return PTR_ERR(hub->vdd);

		err = regulator_enable(hub->vdd);
		if (err)
		return err;

		err = devm_add_action_or_reset(dev,
		usb251xb_regulator_disable_action, hub);
		if (err)
		return err;

		err = usb251xb_connect(hub);
		if (err) {
		dev_err(dev, "Failed to connect hub (%d)\n", err);

Admin message