diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/sleep/proc.c | 2 | ||||
-rw-r--r-- | drivers/i2c/chips/tps65010.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 2d912b71e543..dcde9ddd105a 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file, | |||
60 | state = simple_strtoul(str, NULL, 0); | 60 | state = simple_strtoul(str, NULL, 0); |
61 | #ifdef CONFIG_SOFTWARE_SUSPEND | 61 | #ifdef CONFIG_SOFTWARE_SUSPEND |
62 | if (state == 4) { | 62 | if (state == 4) { |
63 | error = software_suspend(); | 63 | error = pm_suspend(PM_SUSPEND_DISK); |
64 | goto Done; | 64 | goto Done; |
65 | } | 65 | } |
66 | #endif | 66 | #endif |
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index 214fbb1423c5..7ed92dc3d833 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c | |||
@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps) | |||
351 | #if 0 | 351 | #if 0 |
352 | /* REVISIT: this might need its own workqueue | 352 | /* REVISIT: this might need its own workqueue |
353 | * plus tweaks including deadlock avoidance ... | 353 | * plus tweaks including deadlock avoidance ... |
354 | * also needs to get error handling and probably | ||
355 | * an #ifdef CONFIG_SOFTWARE_SUSPEND | ||
354 | */ | 356 | */ |
355 | software_suspend(); | 357 | pm_suspend(PM_SUSPEND_DISK); |
356 | #endif | 358 | #endif |
357 | poll = 1; | 359 | poll = 1; |
358 | } | 360 | } |