Merge "regulator: kryo: fix return value for regulator_disable"

This commit is contained in:
Linux Build Service Account 2018-03-16 01:55:37 -07:00 committed by Gerrit - the friendly Code Review server
commit 07d35574bd

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -311,7 +311,6 @@ done:
static int kryo_regulator_disable(struct regulator_dev *rdev)
{
struct kryo_regulator *kvreg = rdev_get_drvdata(rdev);
int rc;
unsigned long flags;
if (kvreg->vreg_en == false)
@ -322,7 +321,7 @@ static int kryo_regulator_disable(struct regulator_dev *rdev)
kvreg_debug(kvreg, "disabled\n");
spin_unlock_irqrestore(&kvreg->slock, flags);
return rc;
return 0;
}
static int kryo_regulator_is_enabled(struct regulator_dev *rdev)