On Tue, Jun 11, 2019 at 04:09:55PM +0100, Rui Miguel Silva wrote: > When the upstream endpoint is neither a mux nor a CSI2 module, just get > the source pad directly upstream from the CSI. > > Fixes: 05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver") > Reported-by: Sebastien Szymanski <sebastien.szymanski@xxxxxxxxxxxx> > Signed-off-by: Rui Miguel Silva <rui.silva@xxxxxxxxxx> > --- > drivers/staging/media/imx/imx7-media-csi.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c > index 9101566f3f67..8979ee0c8202 100644 > --- a/drivers/staging/media/imx/imx7-media-csi.c > +++ b/drivers/staging/media/imx/imx7-media-csi.c > @@ -442,6 +442,14 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, > > src = &csi->src_sd->entity; > > + /* > + * if the source in neither a mux or csi2 get the one directly upstream ^^ is? > + * from this csi > + */ > + if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && > + src->function != MEDIA_ENT_F_VID_MUX) > + src = &csi->sd.entity; This would be easier to read if the white space were tweaked a little: if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && src->function != MEDIA_ENT_F_VID_MUX) src = &csi->sd.entity; regards, dan carpenter