Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / drivers / media / platform / soc_camera / mx2_camera.c

diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 5cc55f333f84c75caf862aa494210589ba72a26c..4a574f3cfb2f8d72c2fe589b00e65eac7317b466 100644 (file)
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1707,9 +1707,9 @@ static int mx27_camera_emma_init(struct platform_device *pdev)
                goto out;
        }
 
-       pcdev->base_emma = devm_request_and_ioremap(pcdev->dev, res_emma);
-       if (!pcdev->base_emma) {
-               err = -EADDRNOTAVAIL;
+       pcdev->base_emma = devm_ioremap_resource(pcdev->dev, res_emma);
+       if (IS_ERR(pcdev->base_emma)) {
+               err = PTR_ERR(pcdev->base_emma);
                goto out;
        }
 
@@ -1824,9 +1824,9 @@ static int mx2_camera_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&pcdev->discard);
        spin_lock_init(&pcdev->lock);
 
-       pcdev->base_csi = devm_request_and_ioremap(&pdev->dev, res_csi);
-       if (!pcdev->base_csi) {
-               err = -EADDRNOTAVAIL;
+       pcdev->base_csi = devm_ioremap_resource(&pdev->dev, res_csi);
+       if (IS_ERR(pcdev->base_csi)) {
+               err = PTR_ERR(pcdev->base_csi);
                goto exit;
        }