Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-microblaze.git] / arch / arm / mach-omap2 / mux.c

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 0ede4d6..80e55c5 100644 (file)
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -247,7 +247,7 @@ int __init omap_mux_init_signal(const char *muxname, int val)
        int mux_mode;
 
        mux_mode = omap_mux_get_by_name(muxname, &partition, &mux);
-       if (mux_mode < 0)
+       if (mux_mode < 0 || !mux)
                return mux_mode;
 
        old_mode = omap_mux_read(partition, mux->reg_offset);