diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-06-24 02:39:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-08 17:18:12 -0300 |
| commit | 228942efdb88fd1cd90de85cf599171d5c0171ea (patch) | |
| tree | 5b9c759a18a73e5e66f8b909a3598ad6c93db73c /drivers/media/rc/nuvoton-cir.c | |
| parent | e5283f5f1f0c8bf2336a07b44beb4c2bdc2db825 (diff) | |
| download | blackbird-op-linux-228942efdb88fd1cd90de85cf599171d5c0171ea.tar.gz blackbird-op-linux-228942efdb88fd1cd90de85cf599171d5c0171ea.zip | |
[media] media: rc: nuvoton: simplify interrupt handling code
Simplify interupt handling code.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/nuvoton-cir.c')
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index 270a687b47a2..67db965ae8e5 100644 --- a/drivers/media/rc/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c @@ -906,17 +906,12 @@ static irqreturn_t nvt_cir_isr(int irq, void *data) if (status & CIR_IRSTS_RFO) nvt_handle_rx_fifo_overrun(nvt); - if (status & CIR_IRSTS_RTR) { + else if (status & (CIR_IRSTS_RTR | CIR_IRSTS_PE)) { /* We only do rx if not tx'ing */ if (nvt_cir_tx_inactive(nvt)) nvt_get_rx_ir_data(nvt); } - if (status & CIR_IRSTS_PE) { - if (nvt_cir_tx_inactive(nvt)) - nvt_get_rx_ir_data(nvt); - } - spin_unlock_irqrestore(&nvt->nvt_lock, flags); if (status & CIR_IRSTS_TE) |
