diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-24 02:00:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-24 02:00:42 -0700 |
| commit | 6875b99e30c61fe26a49fb6565274fc94945067e (patch) | |
| tree | 18c1035b3e161a5662524dbe6fdbf9d5291900e1 /drivers | |
| parent | 02663bfe05a36e6c5e18a1138e4cbda8526c276f (diff) | |
| parent | edcda5390729b5c634c2497b889acabab7956974 (diff) | |
Merge "serial: msm_serial_hs: Change the wakeup interrupt enable sequence"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/msm_serial_hs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index 51dce6d43890..fa3c9e511663 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -2213,12 +2213,12 @@ void enable_wakeup_interrupt(struct msm_hs_port *msm_uport) return; if (!(msm_uport->wakeup.enabled)) { - enable_irq(msm_uport->wakeup.irq); - disable_irq(uport->irq); spin_lock_irqsave(&uport->lock, flags); msm_uport->wakeup.ignore = 1; msm_uport->wakeup.enabled = true; spin_unlock_irqrestore(&uport->lock, flags); + disable_irq(uport->irq); + enable_irq(msm_uport->wakeup.irq); } else { MSM_HS_WARN("%s:Wake up IRQ already enabled", __func__); } |