aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorGigi Joseph <gigi.joseph@gmail.com>2015-01-08 22:46:24 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-12 08:04:10 -0500
commit4b4aa3ab982e1e6f22a3df12a368803576b73ccf (patch)
treef64b5946d1f67f08a6f8d45105fcd045f0ad7fa6 /drivers/misc
parent46d0d33350e9b32642d745a8b46a954910196b4d (diff)
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)
908 if (pdata->suspend) 908 if (pdata->suspend)
909 return pdata->suspend(pdev, state); 909 return pdata->suspend(pdev, state);
910 910
911 return -EOPNOTSUPP; 911 return 0;
912} 912}
913 913
914static int kim_resume(struct platform_device *pdev) 914static int kim_resume(struct platform_device *pdev)
@@ -925,7 +925,7 @@ static int kim_resume(struct platform_device *pdev)
925 if (pdata->resume) 925 if (pdata->resume)
926 return pdata->resume(pdev); 926 return pdata->resume(pdev);
927 927
928 return -EOPNOTSUPP; 928 return 0;
929} 929}
930 930
931/**********************************************************************/ 931/**********************************************************************/