OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
authorKevin Hilman <khilman@ti.com>
Thu, 1 Sep 2011 17:59:36 +0000 (10:59 -0700)
committerKevin Hilman <khilman@ti.com>
Tue, 6 Sep 2011 20:19:58 +0000 (13:19 -0700)
The suspend/resume _noirq handlers were #ifdef'd out in the
!CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops
struct.  Fix by defining them to NULL in the !CONFIG_SUSPEND case.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kevin Hilman <khilman@ti.com>
arch/arm/plat-omap/omap_device.c

index 9a6a53854911de58ec87005e5c60442e5702f9d7..02609eee05621ab682de81d0fd215972dffbb158 100644 (file)
@@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
 
        return pm_generic_resume_noirq(dev);
 }
+#else
+#define _od_suspend_noirq NULL
+#define _od_resume_noirq NULL
 #endif
 
 static struct dev_pm_domain omap_device_pm_domain = {