Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[cascardo/linux.git] / drivers / video / s3c-fb.c

diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 9b57a23..968a625 100644 (file)
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1421,10 +1421,9 @@ static int s3c_fb_probe(struct platform_device *pdev)
        pm_runtime_enable(sfb->dev);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       sfb->regs = devm_request_and_ioremap(dev, res);
-       if (!sfb->regs) {
-               dev_err(dev, "failed to map registers\n");
-               ret = -ENXIO;
+       sfb->regs = devm_ioremap_resource(dev, res);
+       if (IS_ERR(sfb->regs)) {
+               ret = PTR_ERR(sfb->regs);
                goto err_lcd_clk;
        }