From a5d30d9e557e59305ae1a2ecfd791507f71dc2a9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 4 Jun 2013 12:30:11 -0700
Subject: [PATCH] --- yaml --- r: 376760 b: refs/heads/master c:
 1f89b8fc41b66e5761bb8c3af5517fd42bf2067d h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/android/alarm-dev.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e5b0450b2a4..fc5d08063da2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5d4c96f979611f0165dc825af9e1cea8dd35b9
+refs/heads/master: 1f89b8fc41b66e5761bb8c3af5517fd42bf2067d
diff --git a/trunk/drivers/staging/android/alarm-dev.c b/trunk/drivers/staging/android/alarm-dev.c
index c8600d96b9df..6dc27dac679d 100644
--- a/trunk/drivers/staging/android/alarm-dev.c
+++ b/trunk/drivers/staging/android/alarm-dev.c
@@ -297,6 +297,8 @@ static long alarm_compat_ioctl(struct file *file, unsigned int cmd,
 	}
 
 	rv = alarm_do_ioctl(file, cmd, &ts);
+	if (rv)
+		return rv;
 
 	switch (ANDROID_ALARM_BASE_CMD(cmd)) {
 	case ANDROID_ALARM_GET_TIME(0): /* NOTE: we modified cmd above */
@@ -305,7 +307,7 @@ static long alarm_compat_ioctl(struct file *file, unsigned int cmd,
 		break;
 	}
 
-	return rv;
+	return 0;
 }
 #endif