diff --git a/[refs] b/[refs] index d26cf729f09e..733035cff673 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4829a9967dbe3a3ab192df0bfdde281960cc1319 +refs/heads/master: 71f882fe71823c54ae095ce29ce050f814eefdbc diff --git a/trunk/drivers/staging/android/alarm-dev.c b/trunk/drivers/staging/android/alarm-dev.c index c2d87c546e99..5b7064005188 100644 --- a/trunk/drivers/staging/android/alarm-dev.c +++ b/trunk/drivers/staging/android/alarm-dev.c @@ -237,7 +237,6 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) default: rv = -EINVAL; - goto err1; } err1: return rv;