diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-01-13 16:37:35 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-01-13 16:37:35 -0800 |
| commit | 30e9c9b6c2b0e3a6b7977029403512b27802730b (patch) | |
| tree | 9914f6a63841be8c6d028053343cc863a248149b | |
| parent | e2fd4ee5b215a638340ede00ecb3e249fa012f61 (diff) | |
| parent | b77f9f883dea9d7c73687bb400d5f8ce89aea182 (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
| -rw-r--r-- | kernel/power/wakelock.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c index 8f50de394d2..c8fba338007 100644 --- a/kernel/power/wakelock.c +++ b/kernel/power/wakelock.c @@ -9,7 +9,6 @@ * manipulate wakelocks on Android. */ -#include <linux/capability.h> #include <linux/ctype.h> #include <linux/device.h> #include <linux/err.h> @@ -189,9 +188,6 @@ int pm_wake_lock(const char *buf) size_t len; int ret = 0; - if (!capable(CAP_BLOCK_SUSPEND)) - return -EPERM; - while (*str && !isspace(*str)) str++; @@ -235,9 +231,6 @@ int pm_wake_unlock(const char *buf) size_t len; int ret = 0; - if (!capable(CAP_BLOCK_SUSPEND)) - return -EPERM; - len = strlen(buf); if (!len) return -EINVAL; |