From: Sonic Zhang Date: Tue, 6 Dec 2011 07:16:33 +0000 (+0800) Subject: tty: bfin-sport-uart: Rx interrupt is not called always with irq disabled. X-Git-Tag: firefly_0821_release~3680^2~3806^2~28 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=07143eaefd025098089edee7047714f6604a4a21;p=firefly-linux-kernel-4.4.55.git tty: bfin-sport-uart: Rx interrupt is not called always with irq disabled. Replace local_irq_disable by local_irq_save. Signed-off-by: Sonic Zhang Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h index 6d06ce1d5675..e4510ea135ce 100644 --- a/drivers/tty/serial/bfin_sport_uart.h +++ b/drivers/tty/serial/bfin_sport_uart.h @@ -45,11 +45,12 @@ #define SPORT_GET_RX32(sport) \ ({ \ unsigned int __ret; \ + unsigned long flags; \ if (ANOMALY_05000473) \ - local_irq_disable(); \ + local_irq_save(flags); \ __ret = bfin_read32((sport)->port.membase + OFFSET_RX); \ if (ANOMALY_05000473) \ - local_irq_enable(); \ + local_irq_restore(flags); \ __ret; \ }) #define SPORT_GET_RCR1(sport) bfin_read16(((sport)->port.membase + OFFSET_RCR1))