Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c06ac46 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Greg Kroah-Hartman
Browse files

media: v4l2-fwnode: Return -EINVAL for invalid bus-type 



[ Upstream commit 69baf338fc16a4d55c78da8874ce3f06feb38c78 ]

Return -EINVAL if invalid bus-type is detected while parsing endpoints.

Fixes: 26c1126c ("media: v4l: fwnode: Use media bus type for bus parser selection")
Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d8d35c1e

drivers/media/v4l2-core/v4l2-fwnode.c

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ v4l2_fwnode_bus_type_to_mbus(enum v4l2_fwnode_bus_type type) 
	const struct v4l2_fwnode_bus_conv *conv =

		get_v4l2_fwnode_bus_conv_by_fwnode_bus(type);



	return conv ? conv->mbus_type : V4L2_MBUS_UNKNOWN;

	return conv ? conv->mbus_type : V4L2_MBUS_INVALID;

}



static const char *
@@ -436,6 +436,10 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, 
		 v4l2_fwnode_mbus_type_to_string(vep->bus_type),

		 vep->bus_type);

	mbus_type = v4l2_fwnode_bus_type_to_mbus(bus_type);

	if (mbus_type == V4L2_MBUS_INVALID) {

		pr_debug("unsupported bus type %u\n", bus_type);

		return -EINVAL;

	}



	if (vep->bus_type != V4L2_MBUS_UNKNOWN) {

		if (mbus_type != V4L2_MBUS_UNKNOWN &&

include/media/v4l2-mediabus.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
 * @V4L2_MBUS_CCP2:	CCP2 (Compact Camera Port 2)

 * @V4L2_MBUS_CSI2_DPHY: MIPI CSI-2 serial interface, with D-PHY

 * @V4L2_MBUS_CSI2_CPHY: MIPI CSI-2 serial interface, with C-PHY

 * @V4L2_MBUS_INVALID:	invalid bus type (keep as last)

 */

enum v4l2_mbus_type {

	V4L2_MBUS_UNKNOWN,
@@ -87,6 +88,7 @@ enum v4l2_mbus_type { 
	V4L2_MBUS_CCP2,

	V4L2_MBUS_CSI2_DPHY,

	V4L2_MBUS_CSI2_CPHY,

	V4L2_MBUS_INVALID,

};



/**