Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[platform/kernel/linux-starfive.git] / drivers / pwm / pwm-tipwmss.c

diff --git a/drivers/pwm/pwm-tipwmss.c b/drivers/pwm/pwm-tipwmss.c
index 3448a1c..17cbc59 100644 (file)
--- a/drivers/pwm/pwm-tipwmss.c
+++ b/drivers/pwm/pwm-tipwmss.c
@@ -75,9 +75,9 @@ static int pwmss_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       info->mmio_base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!info->mmio_base)
-               return -EADDRNOTAVAIL;
+       info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(info->mmio_base))
+               return PTR_ERR(info->mmio_base);
 
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);