On Sat, Dec 28, 2013 at 11:03:28AM -0500, Arthur Schwalbenberg wrote: > This is a patch to the alarm_dev.c file that fixes up a return is not > a function warning found by the checkpatch.pl tool > > Signed-off-by: Arthur Schwalbenberg <arthurs578@xxxxxxxxx> Why the odd indentation? > --- > drivers/staging/android/alarm-dev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c > index 647694f..96b2f53 100644 > --- a/drivers/staging/android/alarm-dev.c > +++ b/drivers/staging/android/alarm-dev.c > @@ -68,8 +68,8 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; > */ > static int is_wakeup(enum android_alarm_type type) > { > - return (type == ANDROID_ALARM_RTC_WAKEUP || > - type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP); > + return type == ANDROID_ALARM_RTC_WAKEUP || > + type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP; > } This change is already in linux-next, right? I can't apply the same change more than once to the tree... greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel