diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
| commit | 2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch) | |
| tree | 10924a4ec59c9b2d114c2287bd35e6debc72595f /drivers/power/reset/at91-reset.c | |
| parent | 02787daadbdad80c9c79487b5ef8284aff734a7b (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | blackbird-op-linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.tar.gz blackbird-op-linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.zip | |
Merge tag 'v4.1-rc4' into MTD's -next
Diffstat (limited to 'drivers/power/reset/at91-reset.c')
| -rw-r--r-- | drivers/power/reset/at91-reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 01c7055c4200..ca461ebc7ae8 100644 --- a/drivers/power/reset/at91-reset.c +++ b/drivers/power/reset/at91-reset.c @@ -212,9 +212,9 @@ static int at91_reset_platform_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 ); at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (IS_ERR(at91_ramc_base[idx])) { + if (!at91_ramc_base[idx]) { dev_err(&pdev->dev, "Could not map ram controller address\n"); - return PTR_ERR(at91_ramc_base[idx]); + return -ENOMEM; } } |
