From 1b22d0793505dbaefc35b42053789a57814e9661 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Tue, 21 Apr 2009 12:23:59 -0700
Subject: [PATCH] --- yaml --- r: 143791 b: refs/heads/master c:
 ff14ed5db6e7e5e5dc23712d3c877891d4d9a1a8 h: refs/heads/master i:   143789:
 9d907bf57e8af6f70d64baf90cdb234e1fbb059d   143787:
 787d86e0e0070273f807af51a2774561b0a07272   143783:
 f6757e5dd98421837fb3a1acaa1f011f1b8846ec   143775:
 43887f3cc6e9a88b14110a405c390dff81f1ae62 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/pxafb.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c78027e012b0..8b02242e585f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44aa417910ec9cda6da42be914105e789273b507
+refs/heads/master: ff14ed5db6e7e5e5dc23712d3c877891d4d9a1a8
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 84f63205c46d..0889d50c3288 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -1439,7 +1439,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
 static irqreturn_t pxafb_handle_irq(int irq, void *dev_id)
 {
 	struct pxafb_info *fbi = dev_id;
-	unsigned int lccr0, lcsr, lcsr1;
+	unsigned int lccr0, lcsr;
 
 	lcsr = lcd_readl(fbi, LCSR);
 	if (lcsr & LCSR_LDD) {
@@ -1455,14 +1455,16 @@ static irqreturn_t pxafb_handle_irq(int irq, void *dev_id)
 	lcd_writel(fbi, LCSR, lcsr);
 
 #ifdef CONFIG_FB_PXA_OVERLAY
-	lcsr1 = lcd_readl(fbi, LCSR1);
-	if (lcsr1 & LCSR1_BS(1))
-		complete(&fbi->overlay[0].branch_done);
+	{
+		unsigned int lcsr1 = lcd_readl(fbi, LCSR1);
+		if (lcsr1 & LCSR1_BS(1))
+			complete(&fbi->overlay[0].branch_done);
 
-	if (lcsr1 & LCSR1_BS(2))
-		complete(&fbi->overlay[1].branch_done);
+		if (lcsr1 & LCSR1_BS(2))
+			complete(&fbi->overlay[1].branch_done);
 
-	lcd_writel(fbi, LCSR1, lcsr1);
+		lcd_writel(fbi, LCSR1, lcsr1);
+	}
 #endif
 	return IRQ_HANDLED;
 }