diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-11 07:39:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-11 07:39:38 +0200 |
| commit | 620b74d01b9d4393bef6742bf121908322c2fe0b (patch) | |
| tree | 507ab81bf701a1500b617526afa4232a0634a206 /drivers/usb/typec/tcpm/tcpci.c | |
| parent | c326d3ed52c8b47f0de329b3b213dc32409d3656 (diff) | |
| parent | 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff) | |
Merge 5.15-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/tcpm/tcpci.c')
| -rw-r--r-- | drivers/usb/typec/tcpm/tcpci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 864049631fbe..35a1307349a2 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -696,7 +696,7 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) tcpm_pd_receive(tcpci->port, &msg); } - if (status & TCPC_ALERT_EXTENDED_STATUS) { + if (tcpci->data->vbus_vsafe0v && (status & TCPC_ALERT_EXTENDED_STATUS)) { ret = regmap_read(tcpci->regmap, TCPC_EXTENDED_STATUS, &raw); if (!ret && (raw & TCPC_EXTENDED_STATUS_VSAFE0V)) tcpm_vbus_change(tcpci->port); |