With that we can clear any pending events and the port is registered
so driver can be ready to handle typec events once we request irq.

Signed-off-by: Peter Chen <[email protected]>
Signed-off-by: Li Jun <[email protected]>
---
 drivers/staging/typec/tcpci.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index be6ed16..1db67f0 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -534,15 +534,18 @@ static int tcpci_probe(struct i2c_client *client,
        /* Disable chip interrupts */
        tcpci_write16(tcpci, TCPC_ALERT_MASK, 0);
 
+       tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);
+       if (IS_ERR(tcpci->port))
+               return PTR_ERR(tcpci->port);
+
        err = devm_request_threaded_irq(tcpci->dev, client->irq, NULL,
                                        tcpci_irq,
                                        IRQF_ONESHOT | IRQF_TRIGGER_LOW,
                                        dev_name(tcpci->dev), tcpci);
-       if (err < 0)
-               return err;
+       if (err)
+               tcpm_unregister_port(tcpci->port);
 
-       tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc);
-       return PTR_ERR_OR_ZERO(tcpci->port);
+       return err;
 }
 
 static int tcpci_remove(struct i2c_client *client)
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to