--- /dev/null
+From fd44aa9a254b18176ec3792a18e7de6977030ca8 Mon Sep 17 00:00:00 2001
+From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+Date: Wed, 17 Aug 2016 09:57:37 -0300
+Subject: [media] v4l: rcar-fcp: Don't force users to check for disabled FCP support
+
+From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+
+commit fd44aa9a254b18176ec3792a18e7de6977030ca8 upstream.
+
+The rcar_fcp_enable() function immediately returns successfully when the
+FCP device pointer is NULL to avoid forcing the users to check the FCP
+device manually before every call. However, the stub version of the
+function used when the FCP driver is disabled returns -ENOSYS
+unconditionally, resulting in a different API contract for the two
+versions of the function.
+
+As a user that requires FCP support will fail at probe time when calling
+rcar_fcp_get() if the FCP driver is disabled, the stub version of the
+rcar_fcp_enable() function will only be called with a NULL FCP device.
+We can thus return 0 unconditionally to align the behaviour with the
+normal version of the function.
+
+Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/media/rcar-fcp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/media/rcar-fcp.h
++++ b/include/media/rcar-fcp.h
+@@ -29,7 +29,7 @@ static inline struct rcar_fcp_device *rc
+ static inline void rcar_fcp_put(struct rcar_fcp_device *fcp) { }
+ static inline int rcar_fcp_enable(struct rcar_fcp_device *fcp)
+ {
+- return -ENOSYS;
++ return 0;
+ }
+ static inline void rcar_fcp_disable(struct rcar_fcp_device *fcp) { }
+ #endif