diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-05 10:31:40 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-05 10:31:40 +0300 |
| commit | 57e36159cc0eed51b37ec9a17214fc0079f75879 (patch) | |
| tree | fa4bc1394e49303860332510d3c1a27394345e3f | |
| parent | 11077e9bf7fef8b1081221b482260a6bfa2b6d5f (diff) | |
| parent | 1203839290f151b84f5e54165d6d039e9514b236 (diff) | |
| download | linux-57e36159cc0eed51b37ec9a17214fc0079f75879.tar.xz | |
Merge tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers
drivers for 4.16
- use PTR_ERR_OR_ZERO were relevant in at91_cf
* tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
pcmcia: at91_cf: Use PTR_ERR_OR_ZERO()
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 87147bcd1655..7da7b0f0ae1b 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -236,10 +236,8 @@ static int at91_cf_dt_init(struct platform_device *pdev) pdev->dev.platform_data = board; mc = syscon_regmap_lookup_by_compatible("atmel,at91rm9200-sdramc"); - if (IS_ERR(mc)) - return PTR_ERR(mc); - return 0; + return PTR_ERR_OR_ZERO(mc); } #else static int at91_cf_dt_init(struct platform_device *pdev) |