Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

[deliverable/linux.git] / drivers / media / platform / rcar-fcp.c

diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c
index bc50c69ee0c5800d3c6ecce62a5cdc6546076d55..f3a3f31cdfa9c6cb0715b91f4b39230a3cef4529 100644 (file)
--- a/drivers/media/platform/rcar-fcp.c
+++ b/drivers/media/platform/rcar-fcp.c
@@ -99,14 +99,14 @@ EXPORT_SYMBOL_GPL(rcar_fcp_put);
  */
 int rcar_fcp_enable(struct rcar_fcp_device *fcp)
 {
-       int error;
+       int ret;
 
        if (!fcp)
                return 0;
 
-       error = pm_runtime_get_sync(fcp->dev);
-       if (error < 0)
-               return error;
+       ret = pm_runtime_get_sync(fcp->dev);
+       if (ret < 0)
+               return ret;
 
        return 0;
 }
@@ -165,6 +165,7 @@ static int rcar_fcp_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id rcar_fcp_of_match[] = {
+       { .compatible = "renesas,fcpf" },
        { .compatible = "renesas,fcpv" },
        { },
 };