---

yaml --- r: 296351 b: refs/heads/master c: 058502e h: refs/heads/master i: 296349: 2410f6f 296347: 82f4ce8 296343: 40fab3c 296335: 438c412 296319: b09588a v: v3
git-mirror · Feb 21, 2012 · 1df901f · 1df901f
1 parent 430adf5
commit 1df901f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba5fd193f4fd35e5e1771de15cc1aba11d19590d
+refs/heads/master: 058502eb38a0f687e5af37209488d03656f87ffe
diff --git a/trunk/drivers/video/sa1100fb.c b/trunk/drivers/video/sa1100fb.c
@@ -761,8 +761,19 @@ static void sa1100fb_setup_gpio(struct sa1100fb_info *fbi)
 	}
 
 	if (mask) {
+		unsigned long flags;
+
+		/*
+		 * SA-1100 requires the GPIO direction register set
+		 * appropriately for the alternate function.  Hence
+		 * we set it here via bitmask rather than excessive
+		 * fiddling via the GPIO subsystem - and even then
+		 * we'll still have to deal with GAFR.
+		 */
+		local_irq_save(flags);
 		GPDR |= mask;
 		GAFR |= mask;
+		local_irq_restore(flags);
 	}
 }