Staging tree fix for 3.7-rc5
Here is a single patch, a revert of an android driver patch, that resolves a bug that has been reported in the Android alarm driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlCmRx4ACgkQMUfUDdst+yl3DwCbB9ekMEOeU8kRPiFozI8m702t JbsAnikKlAk+EmoufP46+3+PVKh7582d =pRqt -----END PGP SIGNATURE----- Merge tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree fix from Greg Kroah-Hartman: "Here is a single patch, a revert of an android driver patch, that resolves a bug that has been reported in the Android alarm driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: Revert "Staging: Android alarm: IOCTL command encoding fix"
This commit is contained in:
commit
7e111565b7
|
@ -51,12 +51,10 @@ enum android_alarm_return_flags {
|
||||||
#define ANDROID_ALARM_WAIT _IO('a', 1)
|
#define ANDROID_ALARM_WAIT _IO('a', 1)
|
||||||
|
|
||||||
#define ALARM_IOW(c, type, size) _IOW('a', (c) | ((type) << 4), size)
|
#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 */
|
/* Set alarm */
|
||||||
#define ANDROID_ALARM_SET(type) ALARM_IOW(2, type, struct timespec)
|
#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_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_SET_RTC _IOW('a', 5, struct timespec)
|
||||||
#define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0)))
|
#define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0)))
|
||||||
#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4)
|
#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4)
|
||||||
|
|
Loading…
Reference in a new issue