usb: typec: ucsi: Always cancel the command if PPM reports BUSY condition

This makes it possible to execute next command immediately
after the busy condition.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20210920142419.54493-2-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 5ef5bd0..ffb5be5 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -128,8 +128,10 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd)
        if (ret)
                return ret;
 
-       if (cci & UCSI_CCI_BUSY)
+       if (cci & UCSI_CCI_BUSY) {
+               ucsi->ops->async_write(ucsi, UCSI_CANCEL, NULL, 0);
                return -EBUSY;
+       }
 
        if (!(cci & UCSI_CCI_COMMAND_COMPLETE))
                return -EIO;