[media] rcar_vin: propagate querystd() error upstream

rcar_vin_set_fmt() defaults to  PAL when the subdevice's querystd() method call
fails (e.g. due to I2C error).  This doesn't work very well when a camera being
used  outputs NTSC which has different order of fields and resolution.  Let  us
stop  pretending and return the actual error except  when the querystd() method
is not implemented,  in which case  we'll have  to set the 'field' variable  to
V4L2_FIELD_NONE.

Note that doing this would prevent video capture on at least Renesas Henninger/
Porter boards where I2C seems particularly buggy.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 4069587ae8b6d603429f352bd852f8d89cebbada..1e277104b5fbe31d571435db7f6e84b22aa80f63 100644 (file)
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1602,11 +1602,15 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
        case V4L2_FIELD_INTERLACED:
                /* Query for standard if not explicitly mentioned _TB/_BT */
                ret = v4l2_subdev_call(sd, video, querystd, &std);
-               if (ret < 0)
-                       std = V4L2_STD_625_50;
-
-               field = std & V4L2_STD_625_50 ? V4L2_FIELD_INTERLACED_TB :
-                                               V4L2_FIELD_INTERLACED_BT;
+               if (ret == -ENOIOCTLCMD) {
+                       field = V4L2_FIELD_NONE;
+               } else if (ret < 0) {
+                       return ret;
+               } else {
+                       field = std & V4L2_STD_625_50 ?
+                               V4L2_FIELD_INTERLACED_TB :
+                               V4L2_FIELD_INTERLACED_BT;
+               }
                break;
        }