aboutsummaryrefslogtreecommitdiff
path: root/drivers/regulator/s5m8767.c
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:46 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:46 +0100
commiteea8e85e3b4c19cfa1028822adfd85842553d841 (patch)
tree9d99235fb4f9e050ef5b7d6f951062e7d737d9d8 /drivers/regulator/s5m8767.c
parentfbf6630d707c0776dacbaee0c444fb4c61e4f939 (diff)
parent720a9717bcdad6fbfa22cde082c47fb969a22f6f (diff)
downloadlinaro-lsk-eea8e85e3b4c19cfa1028822adfd85842553d841.tar.gz
Merge remote-tracking branch 'regulator/topic/s5m8767' into v3.9-rc8
Diffstat (limited to 'drivers/regulator/s5m8767.c')
-rw-r--r--drivers/regulator/s5m8767.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 2dd74e25439..c24448bc43c 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -549,7 +549,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) *
pdata->num_regulators, GFP_KERNEL);
- if (!rdata) {
+ if (!rmode) {
dev_err(iodev->dev,
"could not allocate memory for regulator mode\n");
return -ENOMEM;