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/serial | |
| 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/serial')
| -rw-r--r-- | drivers/serial/atmel.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |