Commit acf5631c authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Greg Kroah-Hartman
Browse files

usb: typec: mux: Fix matching with typec_altmode_desc 



In typec_mux_match() "nval" is assigned the number of elements in the
"svid" fwnode property, then the variable is used to store the success
of the read and finally attempts to loop between 0 and "success" - i.e.
not at all - and the code returns indicating that no match was found.

Fix this by using a separate variable to track the success of the read,
to allow the loop to get a change to find a match.

Fixes: 96a6d031 ("usb: typec: mux: Find the muxes by also matching against the device node")
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210516034730.621461-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dcb4b8ad

drivers/usb/typec/mux.c

+4 −3
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id, 
	bool match;

	int nval;

	u16 *val;

	int ret;

	int i;



	/*
@@ -218,10 +219,10 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id, 
	if (!val)

		return ERR_PTR(-ENOMEM);



	nval = fwnode_property_read_u16_array(fwnode, "svid", val, nval);

	if (nval < 0) {

	ret = fwnode_property_read_u16_array(fwnode, "svid", val, nval);

	if (ret < 0) {

		kfree(val);

		return ERR_PTR(nval);

		return ERR_PTR(ret);

	}



	for (i = 0; i < nval; i++) {