Merge remote-tracking branch 'regulator/topic/s5m8767' into v3.9-rc8

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 2dd74e254397cfb0cd1ad0af7f3c2aa635b78097..c24448bc43cfb71658d88afea9779e2b47471495 100644 (file)
--- 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;