diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-28 07:01:09 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-28 07:01:09 +0000 |
| commit | 80bd8f3d09eb6b29378b0010fae0cdab2f3565dc (patch) | |
| tree | 886e839e293d5442be2ff3e0bd5ab0d4d810ff9b /target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch | |
| parent | e9479e62b02b38b5895d6cbb9e2cc530eccf18c4 (diff) | |
| download | upstream-80bd8f3d09eb6b29378b0010fae0cdab2f3565dc.tar.gz upstream-80bd8f3d09eb6b29378b0010fae0cdab2f3565dc.tar.bz2 upstream-80bd8f3d09eb6b29378b0010fae0cdab2f3565dc.zip | |
bcm53xx: use two upstream USB bcma patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48517
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-4.4/810-USB-bcma-use-simpler-devm_gpiod_get.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 ec6ef9ea59..fd2e38a093 100644 --- 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); |