diff options
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 6252c051525a..e086fb075f2b 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -1267,7 +1267,7 @@ static int s3c24xx_i2c_suspend_noirq(struct device *dev) | |||
1267 | return 0; | 1267 | return 0; |
1268 | } | 1268 | } |
1269 | 1269 | ||
1270 | static int s3c24xx_i2c_resume(struct device *dev) | 1270 | static int s3c24xx_i2c_resume_noirq(struct device *dev) |
1271 | { | 1271 | { |
1272 | struct platform_device *pdev = to_platform_device(dev); | 1272 | struct platform_device *pdev = to_platform_device(dev); |
1273 | struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); | 1273 | struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); |
@@ -1285,7 +1285,11 @@ static int s3c24xx_i2c_resume(struct device *dev) | |||
1285 | static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { | 1285 | static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { |
1286 | #ifdef CONFIG_PM_SLEEP | 1286 | #ifdef CONFIG_PM_SLEEP |
1287 | .suspend_noirq = s3c24xx_i2c_suspend_noirq, | 1287 | .suspend_noirq = s3c24xx_i2c_suspend_noirq, |
1288 | .resume = s3c24xx_i2c_resume, | 1288 | .resume_noirq = s3c24xx_i2c_resume_noirq, |
1289 | .freeze_noirq = s3c24xx_i2c_suspend_noirq, | ||
1290 | .thaw_noirq = s3c24xx_i2c_resume_noirq, | ||
1291 | .poweroff_noirq = s3c24xx_i2c_suspend_noirq, | ||
1292 | .restore_noirq = s3c24xx_i2c_resume_noirq, | ||
1289 | #endif | 1293 | #endif |
1290 | }; | 1294 | }; |
1291 | 1295 | ||