diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-05-31 08:59:24 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-31 11:09:39 +0200 |
commit | 5b4dcc6fdeadf4844852efd7c950614de8525a83 (patch) | |
tree | 05bcac8d1f2969053da13557efb42ab38f289bc1 | |
parent | bd9313ebbf9765cd49842a94a9d81de13fa56981 (diff) | |
download | barebox-5b4dcc6fdeadf4844852efd7c950614de8525a83.tar.gz barebox-5b4dcc6fdeadf4844852efd7c950614de8525a83.tar.xz |
gpio: generic: fixup syncing with upstream Linux gpio-mmio driver
Commit inadvertently brcm,bcm6345-gpio, wd,mbl-gpio, and ni,169445-nand-gpio,
because "dat" was now requested twice. Fix this up.
Tested on Erizo.
Fixes: 8f9ef2d9ab ("gpio: generic: sync with upstream Linux gpio-mmio driver")
Reported-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20210531065924.18966-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | drivers/gpio/gpio-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c index 713085267a..3066b3f7a1 100644 --- a/drivers/gpio/gpio-generic.c +++ b/drivers/gpio/gpio-generic.c @@ -537,7 +537,7 @@ static int bgpio_dev_probe(struct device_d *dev) if (IS_ERR(pdata)) return PTR_ERR(pdata); - r = dev_request_mem_resource_by_name(dev, "dat"); + r = dev_get_resource_by_name(dev, IORESOURCE_MEM, "dat"); if (!r) return -EINVAL; |