diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /drivers/pwm/pwm-brcmstb.c | |
| parent | b15d53d009558d14c4f394a6d1fa2039c7f45c43 (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'drivers/pwm/pwm-brcmstb.c')
| -rw-r--r-- | drivers/pwm/pwm-brcmstb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-brcmstb.c b/drivers/pwm/pwm-brcmstb.c index 423ce087cd9c..5d5adee16886 100644 --- a/drivers/pwm/pwm-brcmstb.c +++ b/drivers/pwm/pwm-brcmstb.c @@ -274,8 +274,8 @@ static int brcmstb_pwm_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); p->base = devm_ioremap_resource(&pdev->dev, res); - if (!p->base) { - ret = -ENOMEM; + if (IS_ERR(p->base)) { + ret = PTR_ERR(p->base); goto out_clk; } |