Commit 936ad890 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Mauro Carvalho Chehab

[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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent db33386a
...@@ -1602,11 +1602,15 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd, ...@@ -1602,11 +1602,15 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
case V4L2_FIELD_INTERLACED: case V4L2_FIELD_INTERLACED:
/* Query for standard if not explicitly mentioned _TB/_BT */ /* Query for standard if not explicitly mentioned _TB/_BT */
ret = v4l2_subdev_call(sd, video, querystd, &std); ret = v4l2_subdev_call(sd, video, querystd, &std);
if (ret < 0) if (ret == -ENOIOCTLCMD) {
std = V4L2_STD_625_50; field = V4L2_FIELD_NONE;
} else if (ret < 0) {
field = std & V4L2_STD_625_50 ? V4L2_FIELD_INTERLACED_TB : return ret;
} else {
field = std & V4L2_STD_625_50 ?
V4L2_FIELD_INTERLACED_TB :
V4L2_FIELD_INTERLACED_BT; V4L2_FIELD_INTERLACED_BT;
}
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment