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

Commit fdb6c3cb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 2c06ac46 which is
commit 69baf338fc16a4d55c78da8874ce3f06feb38c78 upstream.

It's not really an ABI break, but it is a genksyms break.  It's a
trivial issue this commit is referencing and not work the hack of a
work-around to keep it in here, so just revert the thing.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie774efb3a30031bbc2b2ca85c398b87d7d065e8e
parent d143b951

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

+1 −5
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_INVALID;

	return conv ? conv->mbus_type : V4L2_MBUS_UNKNOWN;

}



static const char *
@@ -436,10 +436,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 
 * @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,
@@ -88,7 +87,6 @@ enum v4l2_mbus_type { 
	V4L2_MBUS_CCP2,

	V4L2_MBUS_CSI2_DPHY,

	V4L2_MBUS_CSI2_CPHY,

	V4L2_MBUS_INVALID,

};



/**