usb: chipidea: Fix otg event handler

BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ]

At OTG work running time, it's possible that several events need to be
addressed (e.g. ID and VBUS events). The current implementation handles
only one event at a time which leads to ignoring the other one. Fix it.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index db4ceffcf2a6118c9063fa720830cc337a6f92c3..f25d4827fd49c41179326f517b8aeaa7999f54dd 100644 (file)
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -203,14 +203,17 @@ static void ci_otg_work(struct work_struct *work)
        }
 
        pm_runtime_get_sync(ci->dev);
+
        if (ci->id_event) {
                ci->id_event = false;
                ci_handle_id_switch(ci);
-       } else if (ci->b_sess_valid_event) {
+       }
+
+       if (ci->b_sess_valid_event) {
                ci->b_sess_valid_event = false;
                ci_handle_vbus_change(ci);
-       } else
-               dev_err(ci->dev, "unexpected event occurs at %s\n", __func__);
+       }
+
        pm_runtime_put_sync(ci->dev);
 
        enable_irq(ci->irq);