diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2015-01-06 12:37:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-08 08:07:58 +0100 |
| commit | 40662bbb59f18b489c7e2c7c41612f1c16582d2e (patch) | |
| tree | cb96cb4403c8430c3cafca0a5dc06b613c19c660 /drivers | |
| parent | c5151cae1789252cef6efd0720225ded81ae4620 (diff) | |
| download | barebox-40662bbb59f18b489c7e2c7c41612f1c16582d2e.tar.gz barebox-40662bbb59f18b489c7e2c7c41612f1c16582d2e.tar.xz | |
driver: workaroud resource request that conflicts with errno PTR
broken since
commit ed6e965824303255cacc1c1a195d3684caa26bce
Author: Sascha Hauer <s.hauer@pengutronix.de>
resource: Let dev_request_mem_region return an error pointer
Introduce dev_request_mem_region_err_null
only used on platform like at91 where the resource address conflicts
with errno PTR.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/driver.c | 16 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 6 | ||||
| -rw-r--r-- | drivers/serial/atmel.c | 6 |
3 files changed, 22 insertions, 6 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index e0125a1b92..fd9c4d947c 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -318,6 +318,22 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n } EXPORT_SYMBOL(dev_request_mem_region_by_name); +void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num) +{ + struct resource *res; + + res = dev_get_resource(dev, IORESOURCE_MEM, num); + if (IS_ERR(res)) + return NULL; + + res = request_iomem_region(dev_name(dev), res->start, res->end); + if (IS_ERR(res)) + return NULL; + + return (void __force __iomem *)res->start; +} +EXPORT_SYMBOL(dev_request_mem_region_err_null); + void __iomem *dev_request_mem_region(struct device_d *dev, int num) { struct resource *res; diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 0d6d2e7e53..b803f891eb 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -652,9 +652,9 @@ static int at91_gpio_probe(struct device_d *dev) } gpio_banks = max(gpio_banks, alias_idx + 1); - at91_gpio->regbase = dev_request_mem_region(dev, 0); - if (IS_ERR(at91_gpio->regbase)) - return PTR_ERR(at91_gpio->regbase); + at91_gpio->regbase = dev_request_mem_region_err_null(dev, 0); + if (!at91_gpio->regbase) + return -ENOENT; at91_gpio->chip.ops = &at91_gpio_ops; at91_gpio->chip.ngpio = MAX_NB_GPIO_PER_BANK; diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 1f406925a3..4e4624e235 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -398,9 +398,9 @@ static int atmel_serial_init_port(struct console_device *cdev) struct device_d *dev = cdev->dev; struct atmel_uart_port *uart = to_atmel_uart_port(cdev); - uart->base = dev_request_mem_region(dev, 0); - if (IS_ERR(uart->base)) - return PTR_ERR(uart->base); + uart->base = dev_request_mem_region_err_null(dev, 0); + if (!uart->base) + return -ENOENT; uart->clk = clk_get(dev, "usart"); clk_enable(uart->clk); |