Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / staging / android / alarm-dev.c

diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 32614d611283004fff211579a81bd0569fea977f..5b7064005188d9ac9299ee24e79e9c163ef785df 100644 (file)
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -237,7 +237,6 @@ from_old_alarm_set:
 
        default:
                rv = -EINVAL;
-               goto err1;
        }
 err1:
        return rv;
@@ -255,7 +254,7 @@ static int alarm_release(struct inode *inode, struct file *file)
        unsigned long flags;
 
        spin_lock_irqsave(&alarm_slock, flags);
-       if (file->private_data != 0) {
+       if (file->private_data) {
                for (i = 0; i < ANDROID_ALARM_TYPE_COUNT; i++) {
                        uint32_t alarm_type_mask = 1U << i;
                        if (alarm_enabled & alarm_type_mask) {