aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2010-07-26 10:06:12 +0100
committerMatthew Garrett <mjg@redhat.com>2010-08-03 09:50:33 -0400
commit77e01d6d177f060f466417fa32fc3e1381a73502 (patch)
treebda4acd937c9230d7f3f0fb02077b857ac39b7da /drivers/platform
parent215c330fe92be8d9f74bc292ea085dbe2ace6bf5 (diff)
downloadkernel_samsung_tuna-77e01d6d177f060f466417fa32fc3e1381a73502.zip
kernel_samsung_tuna-77e01d6d177f060f466417fa32fc3e1381a73502.tar.gz
kernel_samsung_tuna-77e01d6d177f060f466417fa32fc3e1381a73502.tar.bz2
intel_scu_ipc: return -EIO for error condition in busy_loop
Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_scu_ipc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 84a2d4b..23b6d46 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -148,7 +148,10 @@ static inline int busy_loop(void) /* Wait till scu status is busy */
return -ETIMEDOUT;
}
}
- return (status >> 1) & 1;
+ if ((status >> 1) & 1)
+ return -EIO;
+
+ return 0;
}
/* Read/Write power control(PMIC in Langwell, MSIC in PenWell) registers */