diff options
| author | Ingo Molnar <[email protected]> | 2016-10-16 11:31:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-10-16 11:31:39 +0200 |
| commit | 1d33369db25eb7f37b7a8bd22d736888b4501a9c (patch) | |
| tree | 116d764339be1bca928870151decbedc53a9e1d1 /drivers/media/platform/rcar-fcp.c | |
| parent | 23446cb66c073b827779e5eb3dec301623299b32 (diff) | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
Merge tag 'v4.9-rc1' into x86/urgent, to pick up updates
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/media/platform/rcar-fcp.c')
| -rw-r--r-- | drivers/media/platform/rcar-fcp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c index bc50c69ee0c5..f3a3f31cdfa9 100644 --- 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" }, { }, }; |