diff options
| author | Colin Cross <ccross@android.com> | 2012-11-07 18:21:51 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-12-04 21:03:42 -0500 |
| commit | da3cb4a716475fe26b77aef8043c46ba504fcadc (patch) | |
| tree | 680ba1664fb54e8be419d2e48f78c4d05f675f2f | |
| parent | 77b3e95850027f528f0cc2d655695c91eb19e0ea (diff) | |
Revert "Staging: Android alarm: IOCTL command encoding fix"tracking-linaro-android-3.7-llct-20121211.0tracking-linaro-android-3.7-llct-20121210.0tracking-linaro-android-3.7-llct-20121206.0
Commit 6bd4a5d96c08dc2380f8053b1bd4f879f55cd3c9 changed the
ANDROID_ALARM_GET_TIME ioctls from IOW to IOR. While technically
correct, the _IOC_DIR bits are ignored by alarm_ioctl, so the
commit breaks a userspace ABI used by all existing Android devices
for a purely cosmetic reason. Revert it.
Cc: stable <stable@vger.kernel.org>
Cc: Dae S. Kim <dae@velatum.com>
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/staging/android/android_alarm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/android/android_alarm.h b/drivers/staging/android/android_alarm.h index f2ffd963f1c3..d0cafd637199 100644 --- a/drivers/staging/android/android_alarm.h +++ b/drivers/staging/android/android_alarm.h @@ -51,12 +51,10 @@ enum android_alarm_return_flags { #define ANDROID_ALARM_WAIT _IO('a', 1) #define ALARM_IOW(c, type, size) _IOW('a', (c) | ((type) << 4), size) -#define ALARM_IOR(c, type, size) _IOR('a', (c) | ((type) << 4), size) - /* Set alarm */ #define ANDROID_ALARM_SET(type) ALARM_IOW(2, type, struct timespec) #define ANDROID_ALARM_SET_AND_WAIT(type) ALARM_IOW(3, type, struct timespec) -#define ANDROID_ALARM_GET_TIME(type) ALARM_IOR(4, type, struct timespec) +#define ANDROID_ALARM_GET_TIME(type) ALARM_IOW(4, type, struct timespec) #define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) #define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) #define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) |