| Message ID | 20190109001551.16113-6-slongerbeam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | imx-media: Fixes for interlaced capture | expand |
On Tue, 2019-01-08 at 16:15 -0800, Steve Longerbeam wrote: > Some imx platforms do not have fwnode connections to all CSI input > ports, and should not be treated as an error. This includes the > imx6q SabreAuto, which has no connections to ipu1_csi1 and ipu2_csi0. > Return -ENOTCONN in imx_csi_parse_endpoint() so that v4l2-fwnode > endpoint parsing will not treat an unconnected endpoint as an error. > > Fixes: c893500a16baf ("media: imx: csi: Register a subdev notifier") > > Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> > --- > drivers/staging/media/imx/imx-media-csi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index e3a4f39dbf73..b276672cae1d 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -1815,7 +1815,7 @@ static int imx_csi_parse_endpoint(struct device *dev, > struct v4l2_fwnode_endpoint *vep, > struct v4l2_async_subdev *asd) > { > - return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL; > + return fwnode_device_is_available(asd->match.fwnode) ? 0 : -ENOTCONN; > } > > static int imx_csi_async_register(struct csi_priv *priv) Is this something that should be applied as a fix, separately from this series? regards Philipp
On 1/9/19 3:13 AM, Philipp Zabel wrote: > On Tue, 2019-01-08 at 16:15 -0800, Steve Longerbeam wrote: >> Some imx platforms do not have fwnode connections to all CSI input >> ports, and should not be treated as an error. This includes the >> imx6q SabreAuto, which has no connections to ipu1_csi1 and ipu2_csi0. >> Return -ENOTCONN in imx_csi_parse_endpoint() so that v4l2-fwnode >> endpoint parsing will not treat an unconnected endpoint as an error. >> >> Fixes: c893500a16baf ("media: imx: csi: Register a subdev notifier") >> >> Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> >> --- >> drivers/staging/media/imx/imx-media-csi.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c >> index e3a4f39dbf73..b276672cae1d 100644 >> --- a/drivers/staging/media/imx/imx-media-csi.c >> +++ b/drivers/staging/media/imx/imx-media-csi.c >> @@ -1815,7 +1815,7 @@ static int imx_csi_parse_endpoint(struct device *dev, >> struct v4l2_fwnode_endpoint *vep, >> struct v4l2_async_subdev *asd) >> { >> - return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL; >> + return fwnode_device_is_available(asd->match.fwnode) ? 0 : -ENOTCONN; >> } >> >> static int imx_csi_async_register(struct csi_priv *priv) > Is this something that should be applied as a fix, separately from this > series? Yes. I'll submit it separately and send a v7 of this series without it. Steve
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index e3a4f39dbf73..b276672cae1d 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -1815,7 +1815,7 @@ static int imx_csi_parse_endpoint(struct device *dev, struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd) { - return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL; + return fwnode_device_is_available(asd->match.fwnode) ? 0 : -ENOTCONN; } static int imx_csi_async_register(struct csi_priv *priv)
Some imx platforms do not have fwnode connections to all CSI input ports, and should not be treated as an error. This includes the imx6q SabreAuto, which has no connections to ipu1_csi1 and ipu2_csi0. Return -ENOTCONN in imx_csi_parse_endpoint() so that v4l2-fwnode endpoint parsing will not treat an unconnected endpoint as an error. Fixes: c893500a16baf ("media: imx: csi: Register a subdev notifier") Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> --- drivers/staging/media/imx/imx-media-csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)