Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  VIDEO: amba clcd: don't disable an already disabled clock
  ARM: Tighten check for allowable CPSR values
  ARM: 6329/1: wire up sys_accept4() on ARM
  ARM: 6328/1: Build with -fno-dwarf2-cfi-asm
  ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index afe21e6eb544..1c2c68356ea7 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -80,7 +80,10 @@ static void clcdfb_disable(struct clcd_fb *fb)
         /*
          * Disable CLCD clock source.
          */
-        clk_disable(fb->clk);
+        if (fb->clk_enabled) {
+                fb->clk_enabled = false;
+                clk_disable(fb->clk);
+        }
 }
 
 static void clcdfb_enable(struct clcd_fb *fb, u32 cntl)
@@ -88,7 +91,10 @@ static void clcdfb_enable(struct clcd_fb *fb, u32 cntl)
         /*
          * Enable the CLCD clock source.
          */
-        clk_enable(fb->clk);
+        if (!fb->clk_enabled) {
+                fb->clk_enabled = true;
+                clk_enable(fb->clk);
+        }
 
         /*
          * Bring up by first enabling..