diff options
| author | Loic Poulain <loic.poulain@linaro.org> | 2018-09-04 17:18:57 +0200 |
|---|---|---|
| committer | Peter Chen <peter.chen@nxp.com> | 2018-09-20 17:04:21 +0800 |
| commit | 8b97d73c4d72a2abf58f8e49062a7ee1e5f1334e (patch) | |
| tree | 95083bfa70f30922b0b64e080c4305d80a93dfd7 /drivers/usb/chipidea/otg.h | |
| parent | 1fa9697c85382ef6aebc49384f6143a7c0af3745 (diff) | |
| download | linux-stable-8b97d73c4d72a2abf58f8e49062a7ee1e5f1334e.tar.gz linux-stable-8b97d73c4d72a2abf58f8e49062a7ee1e5f1334e.tar.bz2 linux-stable-8b97d73c4d72a2abf58f8e49062a7ee1e5f1334e.zip | |
usb: chipidea: Prevent unbalanced IRQ disable
The ChipIdea IRQ is disabled before scheduling the otg work and
re-enabled on otg work completion. However if the job is already
scheduled we have to undo the effect of disable_irq int order to
balance the IRQ disable-depth value.
Fixes: be6b0c1bd0be ("usb: chipidea: using one inline function to cover queue work operations")
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Diffstat (limited to 'drivers/usb/chipidea/otg.h')
| -rw-r--r-- | drivers/usb/chipidea/otg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h index 7e7428e48bfa..4f8b8179ec96 100644 --- a/drivers/usb/chipidea/otg.h +++ b/drivers/usb/chipidea/otg.h @@ -17,7 +17,8 @@ void ci_handle_vbus_change(struct ci_hdrc *ci); static inline void ci_otg_queue_work(struct ci_hdrc *ci) { disable_irq_nosync(ci->irq); - queue_work(ci->wq, &ci->work); + if (queue_work(ci->wq, &ci->work) == false) + enable_irq(ci->irq); } #endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */ |