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

This commit is contained in:
Mark Brown 2013-04-28 02:13:46 +01:00
commit eea8e85e3b

View File

@ -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;