aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorGravatar Gigi Joseph <gigi.joseph@gmail.com> 2015-01-09 03:46:24 +0000
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2015-01-12 05:04:10 -0800
commit4b4aa3ab982e1e6f22a3df12a368803576b73ccf (patch)
treef64b5946d1f67f08a6f8d45105fcd045f0ad7fa6 /drivers/misc
parentti-st: add device tree support (diff)
downloadlinux-4b4aa3ab982e1e6f22a3df12a368803576b73ccf.tar.gz
linux-4b4aa3ab982e1e6f22a3df12a368803576b73ccf.tar.bz2
linux-4b4aa3ab982e1e6f22a3df12a368803576b73ccf.zip
st_kim: allow suspend if callback is not registered
Suspend/resume was failing if callbacks were not registered. As it is ok not to do anything when suspending fix this so it soen't return an error and allow the system to suspend. Signed-off-by: Eyal Reizer <eyalr@ti.com> Signed-off-by: Gigi Joseph <gigi.joseph@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/ti-st/st_kim.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 68a0b582d81a..f2c1071e54c9 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -908,7 +908,7 @@ static int kim_suspend(struct platform_device *pdev, pm_message_t state)
if (pdata->suspend)
return pdata->suspend(pdev, state);
- return -EOPNOTSUPP;
+ return 0;
}
static int kim_resume(struct platform_device *pdev)
@@ -925,7 +925,7 @@ static int kim_resume(struct platform_device *pdev)
if (pdata->resume)
return pdata->resume(pdev);
- return -EOPNOTSUPP;
+ return 0;
}
/**********************************************************************/