Commit d91adc53 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Greg Kroah-Hartman
Browse files

Revert "USB: bcma: Add a check for devm_gpiod_get" 



This reverts commit f3de5d85.

That commit broke USB on all routers that have USB always powered on and
don't require toggling any GPIO. It's a majority of devices actually.

The original code worked and seemed safe: vcc GPIO is optional and
bcma_hci_platform_power_gpio() takes care of checking the pointer before
using it.

This revert fixes:
[   10.801127] bcma_hcd: probe of bcma0:11 failed with error -2

Fixes: f3de5d85 ("USB: bcma: Add a check for devm_gpiod_get")
Cc: stable <stable@vger.kernel.org>
Cc: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20210831065419.18371-1-zajec5@gmail.com


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

drivers/usb/host/bcma-hcd.c

+1 −4
Original line number Diff line number Diff line
@@ -406,12 +406,9 @@ static int bcma_hcd_probe(struct bcma_device *core) 
		return -ENOMEM;

	usb_dev->core = core;



	if (core->dev.of_node) {

	if (core->dev.of_node)

		usb_dev->gpio_desc = devm_gpiod_get(&core->dev, "vcc",

						    GPIOD_OUT_HIGH);

		if (IS_ERR(usb_dev->gpio_desc))

			return PTR_ERR(usb_dev->gpio_desc);

	}



	switch (core->id.id) {

	case BCMA_CORE_USB20_HOST: