diff options
| author | Colin Ian King | 2017-10-11 11:09:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-17 11:56:12 +0200 |
| commit | 707a123d7affbf1e98f08d1962d81a0d64f83191 (patch) | |
| tree | 70ac94a4ecfcf46408d71b520dd26c64a0be38a7 /drivers/usb | |
| parent | usb: typec: tcpm: reset the port on removal (diff) | |
| download | kernel-qcow2-linux-707a123d7affbf1e98f08d1962d81a0d64f83191.tar.gz kernel-qcow2-linux-707a123d7affbf1e98f08d1962d81a0d64f83191.tar.xz kernel-qcow2-linux-707a123d7affbf1e98f08d1962d81a0d64f83191.zip | |
usb: typec: wcove: fix uninitialized usbc_irq1 and usbc_irq2
Calls to regmap_read may fail with an -EINVAL return without setting
usbc_irq1 and usbc_irq2. The error handling clean up expects these
to have been set (or zero on a failure) and currently may try to
clear the wrong IRQs if the uninitalized garbage values in usbc_irq1
or usbc_irq2 are non-zero. The simplest fix is to ensure these
variables are initialized to zero.
Detected by CoverityScan, CID#1457737 ("Uninitialized scalar variable")
Fixes: 3c4fb9f16921 ("usb: typec: wcove: start using tcpm for USB PD support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/typec/typec_wcove.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/typec_wcove.c index a47a93ad34b7..4ce30a967962 100644 --- a/drivers/usb/typec/typec_wcove.c +++ b/drivers/usb/typec/typec_wcove.c @@ -441,8 +441,8 @@ static int wcove_read_rx_buffer(struct wcove_typec *wcove, void *msg) static irqreturn_t wcove_typec_irq(int irq, void *data) { struct wcove_typec *wcove = data; - unsigned int usbc_irq1; - unsigned int usbc_irq2; + unsigned int usbc_irq1 = 0; + unsigned int usbc_irq2 = 0; unsigned int cc1ctrl; int ret; |