Commit aba2081e authored by Jens Axboe's avatar Jens Axboe Committed by Greg Kroah-Hartman
Browse files

tps6598x: clear int mask on probe failure 



The interrupt mask is enabled before any potential failure points in
the driver, which can leave a failure path where we exit with
interrupts enabled but the device not live. This causes an infinite
stream of interrupts on an Apple M1 Pro laptop on USB-C.

Add a failure label that's used post enabling interrupts, where we
mask them again before returning an error.

Suggested-by: default avatarSven Peter <sven@svenpeter.dev>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/e6b80669-20f3-06e7-9ed5-8951a9c6db6f@kernel.dk


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

drivers/usb/typec/tipd/core.c

+4 −3
Original line number Diff line number Diff line
@@ -761,12 +761,12 @@ static int tps6598x_probe(struct i2c_client *client) 


	ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);

	if (ret < 0)

		return ret;

		goto err_clear_mask;

	trace_tps6598x_status(status);



	ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);

	if (ret < 0)

		return ret;

		goto err_clear_mask;



	/*

	 * This fwnode has a "compatible" property, but is never populated as a
@@ -855,7 +855,8 @@ static int tps6598x_probe(struct i2c_client *client) 
	usb_role_switch_put(tps->role_sw);

err_fwnode_put:

	fwnode_handle_put(fwnode);



err_clear_mask:

	tps6598x_write64(tps, TPS_REG_INT_MASK1, 0);

	return ret;

}