bcm53xx: use two upstream USB bcma patches

[openwrt/openwrt.git] / target / linux / bcm53xx / patches-4.4 / 810-USB-bcma-use-simpler-devm_gpiod_get.patch

diff --git a/target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch b/target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch
index ec6ef9ea59a75030ef5a01523b329a5f7ab5741f..fd2e38a093064fd04cf211164982bb52b96e15f3 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch
+++ b/target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch
@@ -13,11 +13,11 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 --- a/drivers/usb/host/bcma-hcd.c
 +++ b/drivers/usb/host/bcma-hcd.c
 @@ -568,8 +568,7 @@ static int bcma_hcd_probe(struct bcma_de
-       usb_dev->core = dev;
+       usb_dev->core = core;
  
-       if (dev->dev.of_node)
--              usb_dev->gpio_desc = devm_get_gpiod_from_child(&dev->dev, "vcc",
--                                                             &dev->dev.of_node->fwnode);
+       if (core->dev.of_node)
+-              usb_dev->gpio_desc = devm_get_gpiod_from_child(&core->dev, "vcc",
+-                                                             &core->dev.of_node->fwnode);
 +              usb_dev->gpio_desc = devm_gpiod_get(&dev->dev, "vcc", 0);
        if (!IS_ERR_OR_NULL(usb_dev->gpio_desc))
                gpiod_direction_output(usb_dev->gpio_desc, 1);