Merge branch 'next' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / input / misc / ims-pcu.c

diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index 69caee906ecd31d35bd7be83f51e9718310dfc99..ac1fa5f4458052a97d5e8793123ce6b54623a9fa 100644 (file)
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -1381,7 +1381,7 @@ static ssize_t ims_pcu_ofn_reg_addr_store(struct device *dev,
        pcu->ofn_reg_addr = value;
        mutex_unlock(&pcu->cmd_mutex);
 
-       return error ?: count;
+       return count;
 }
 
 static DEVICE_ATTR(reg_addr, S_IRUGO | S_IWUSR,