korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

tps6598x: clear int mask on probe failure

Browse Source 
commit aba2081e0a upstream.

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: Sven Peter <sven@svenpeter.dev>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/e6b80669-20f3-06e7-9ed5-8951a9c6db6f@kernel.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jens Axboe 2022-02-15 11:22:04 -07:00 committed by Greg Kroah-Hartman
parent bde6a6b111
commit 7a7e1b3aee
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/typec/tipd/core.c
View File

@ -618,12 +618,12 @@ static int tps6598x_probe(struct i2c_client *client)
ret = tps6598x_read32(tps, TPS_REG_STATUS, &status); ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
if (ret < 0) if (ret < 0)
return ret; goto err_clear_mask;
trace_tps6598x_status(status); trace_tps6598x_status(status);
ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf); ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);
if (ret < 0) if (ret < 0)
return ret; goto err_clear_mask;
/* /*
* This fwnode has a "compatible" property, but is never populated as a * This fwnode has a "compatible" property, but is never populated as a
@ -712,7 +712,8 @@ err_role_put:
usb_role_switch_put(tps->role_sw); usb_role_switch_put(tps->role_sw);
err_fwnode_put: err_fwnode_put:
fwnode_handle_put(fwnode); fwnode_handle_put(fwnode);
err_clear_mask:
tps6598x_write64(tps, TPS_REG_INT_MASK1, 0);
return ret; return ret;
} }