Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d35574 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2a7776a7 cce6e2b4

drivers/regulator/kryo-regulator.c

+2 −3
Original line number Diff line number Diff line 
/*

 * 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)