From bb3dab6faf894342b1ae62281a63f1fb60a57e67 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Tue, 6 Dec 2011 15:16:33 +0800 Subject: [PATCH] --- yaml --- r: 280694 b: refs/heads/master c: 07143eaefd025098089edee7047714f6604a4a21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/bfin_sport_uart.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c4c059a498a..01ed1f544568 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5b6940cbc6fb955a0c2be7ed324efc00e61f481 +refs/heads/master: 07143eaefd025098089edee7047714f6604a4a21 diff --git a/trunk/drivers/tty/serial/bfin_sport_uart.h b/trunk/drivers/tty/serial/bfin_sport_uart.h index 6d06ce1d5675..e4510ea135ce 100644 --- a/trunk/drivers/tty/serial/bfin_sport_uart.h +++ b/trunk/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))