Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / drivers / i2c / chips / tps65010.c

diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 214fbb1..7ed92dc 100644 (file)
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps)
 #if 0
                        /* REVISIT:  this might need its own workqueue
                         * plus tweaks including deadlock avoidance ...
+                        * also needs to get error handling and probably
+                        * an #ifdef CONFIG_SOFTWARE_SUSPEND
                         */
-                       software_suspend();
+                       pm_suspend(PM_SUSPEND_DISK);
 #endif
                        poll = 1;
                }