From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Boris BREZILLON <boris.brezillon@free-electrons.com>,
Lior Amsalem <alior@marvell.com>,
Tawfik Bayouk <tawfik@marvell.com>,
Nadav Haklai <nadavh@marvell.com>,
linux-ide@vger.kernel.org,
Gregory CLEMENT <gregory.clement@free-electrons.com>
Subject: [PATCH 1/2] regulator: core: Add a sanity check on the regulator_ enable/disable functions
Date: Fri, 26 Dec 2014 18:26:38 +0100 [thread overview]
Message-ID: <1419614799-5770-2-git-send-email-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <1419614799-5770-1-git-send-email-gregory.clement@free-electrons.com>
These two functions use the pointer passed in parameter without any
check. By adding a NULL pointer check, it allows using those functions
from a driver in a more generic way. It is useful especially for the
disable case if the regulator is optional.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
drivers/regulator/core.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e225711bb8bc..de29399b5430 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1911,12 +1911,16 @@ static int _regulator_enable(struct regulator_dev *rdev)
*/
int regulator_enable(struct regulator *regulator)
{
- struct regulator_dev *rdev = regulator->rdev;
+ struct regulator_dev *rdev;
int ret = 0;
+ if (!regulator)
+ return 0;
+
if (regulator->always_on)
return 0;
+ rdev = regulator->rdev;
if (rdev->supply) {
ret = regulator_enable(rdev->supply);
if (ret != 0)
@@ -2024,12 +2028,17 @@ static int _regulator_disable(struct regulator_dev *rdev)
*/
int regulator_disable(struct regulator *regulator)
{
- struct regulator_dev *rdev = regulator->rdev;
+ struct regulator_dev *rdev;
int ret = 0;
+ if (!regulator)
+ return 0;
+
if (regulator->always_on)
return 0;
+ rdev = regulator->rdev;
+
mutex_lock(&rdev->mutex);
ret = _regulator_disable(rdev);
mutex_unlock(&rdev->mutex);
--
1.9.1
next prev parent reply other threads:[~2014-12-26 17:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-26 17:26 Gregory CLEMENT
2014-12-26 17:26 ` Gregory CLEMENT [this message]
2014-12-29 15:40 ` [PATCH 1/2] regulator: core: Add a sanity check on the regulator_ enable/disable functions Mark Brown
2015-01-06 11:36 ` Gregory CLEMENT
2015-01-06 12:00 ` Mark Brown
2015-01-06 12:26 ` Gregory CLEMENT
2015-01-06 16:03 ` Mark Brown
2014-12-26 17:26 ` [PATCH 2/2] regulator: core: Add the device tree version to the regulator_get family Gregory CLEMENT
2014-12-29 15:49 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1419614799-5770-2-git-send-email-gregory.clement@free-electrons.com \
--to=gregory.clement@free-electrons.com \
--cc=alior@marvell.com \
--cc=boris.brezillon@free-electrons.com \
--cc=broonie@kernel.org \
--cc=ezequiel.garcia@free-electrons.com \
--cc=lgirdwood@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=nadavh@marvell.com \
--cc=tawfik@marvell.com \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox