---

yaml --- r: 376755 b: refs/heads/master c: 60bba38 h: refs/heads/master i: 376753: 32b0580 376751: 74a18ba v: v3
git-mirror · Jun 4, 2013 · ee19f35 · ee19f35
1 parent fbe974c
commit ee19f35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e919b86c3b018c0e0c5e522354e743dcc0824ee1
+refs/heads/master: 60bba385c5e86ee6a654e3345093eb48e258eb1d
diff --git 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