diff options
| author | Federico Vaga <federico.vaga@cern.ch> | 2014-09-01 13:49:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-23 23:26:42 -0700 |
| commit | 95e838c915edbdde366d111905245171ac99c2cc (patch) | |
| tree | 16f44db4a8158f2f61c96c13e6a69f47f3e49d57 /drivers/ipack | |
| parent | 1451f414639465995dfc1f820aa1a64723cbd662 (diff) | |
| download | linux-stable-95e838c915edbdde366d111905245171ac99c2cc.tar.gz linux-stable-95e838c915edbdde366d111905245171ac99c2cc.tar.bz2 linux-stable-95e838c915edbdde366d111905245171ac99c2cc.zip | |
ipoctal: clear break interrupt as soon as it occurs
In some condition we receive the break interrupt but nothing is putted
in the Rx FIFO and the correspondend bit in the status register is not
set. Thus, no-one clear the interrupt and the handler will be called
forever.
This patch clear the break interrupt as soon as it occurs. Then, if the
break character '\0' is putted in the fifo we will manage it.
We can also unmask the Break interrupt but its bit in ISR is still set
on break. So I think is better to keep the registers clean.
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ipack')
| -rw-r--r-- | drivers/ipack/devices/ipoctal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index 42700815d05f..035d5449227e 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/drivers/ipack/devices/ipoctal.c @@ -175,7 +175,6 @@ static void ipoctal_irq_rx(struct ipoctal_channel *channel, u8 sr) flag = TTY_FRAME; } if (sr & SR_RECEIVED_BREAK) { - iowrite8(CR_CMD_RESET_BREAK_CHANGE, &channel->regs->w.cr); channel->stats.rcv_break++; flag = TTY_BREAK; } @@ -220,6 +219,9 @@ static void ipoctal_irq_channel(struct ipoctal_channel *channel) isr = ioread8(&channel->block_regs->r.isr); sr = ioread8(&channel->regs->r.sr); + if (isr & (IMR_DELTA_BREAK_A | IMR_DELTA_BREAK_B)) + iowrite8(CR_CMD_RESET_BREAK_CHANGE, &channel->regs->w.cr); + if ((sr & SR_TX_EMPTY) && (channel->nb_bytes == 0)) { iowrite8(CR_DISABLE_TX, &channel->regs->w.cr); /* In case of RS-485, change from TX to RX when finishing TX. |