From 6de188057166caf8203c20b139f8390d24f5a10c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 31 May 2011 12:00:09 -0700
Subject: [PATCH] --- yaml --- r: 253150 b: refs/heads/master c:
 d4ff6121b44081601206980cafcd6ed3ecb367b6 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-omap2/mux.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da50f2725981..e7a2ea5f5604 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1499f2dbafafe844e485ff8945f60cd9f3d5cbd9
+refs/heads/master: d4ff6121b44081601206980cafcd6ed3ecb367b6
diff --git a/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c
index b4f90661382c..c7fb22abc219 100644
--- a/trunk/arch/arm/mach-omap2/mux.c
+++ b/trunk/arch/arm/mach-omap2/mux.c
@@ -83,6 +83,9 @@ void omap_mux_write(struct omap_mux_partition *partition, u16 val,
 void omap_mux_write_array(struct omap_mux_partition *partition,
 				 struct omap_board_mux *board_mux)
 {
+	if (!board_mux)
+		return;
+
 	while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
 		omap_mux_write(partition, board_mux->value,
 			       board_mux->reg_offset);