summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorKiran Padwal <kiran.padwal@smartplayin.com>2015-02-11 15:40:50 +0530
committerLee Jones <lee.jones@linaro.org>2015-02-16 17:11:43 +0000
commit0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33 (patch)
tree0e4fb8be0b47c357f6cbeddb4a7cfc7de69f43f1 /drivers/mfd
parentbb400d2120bd253d73661c452b18485d2d5b42dd (diff)
downloadlinux-stable-0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33.tar.gz
linux-stable-0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33.tar.bz2
linux-stable-0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33.zip
mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
This patch add a missing check on the return value of devm_kzalloc, which would cause a NULL pointer dereference in a OOM situation. Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/intel_soc_pmic_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
index df7b0642a5b4..80cef048b904 100644
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -64,6 +64,9 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
config = (struct intel_soc_pmic_config *)id->driver_data;
pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
+ if (!pmic)
+ return -ENOMEM;
+
dev_set_drvdata(dev, pmic);
pmic->regmap = devm_regmap_init_i2c(i2c, config->regmap_config);