diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:44 +0100 |
| commit | 95328a190e7374ea05d6ae9370095dee6d852c17 (patch) | |
| tree | d56848560a16b258a0fcb7e0800a0ef3d2726604 /drivers/regulator | |
| parent | 9eaec296d064846dbc21fa020f5e16e53bdcc5a3 (diff) | |
| parent | 9df19a5597f70e8fd15c065035f5b6362fec91a5 (diff) | |
| download | linux-3.10-95328a190e7374ea05d6ae9370095dee6d852c17.tar.gz linux-3.10-95328a190e7374ea05d6ae9370095dee6d852c17.tar.bz2 linux-3.10-95328a190e7374ea05d6ae9370095dee6d852c17.zip | |
Merge remote-tracking branch 'regulator/topic/max8998' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max8998.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index b588f07c7ca..a57a1b15cdb 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c @@ -665,14 +665,16 @@ static int max8998_pmic_probe(struct platform_device *pdev) gpio_is_valid(pdata->buck1_set2)) { /* Check if SET1 is not equal to 0 */ if (!pdata->buck1_set1) { - printk(KERN_ERR "MAX8998 SET1 GPIO defined as 0 !\n"); + dev_err(&pdev->dev, + "MAX8998 SET1 GPIO defined as 0 !\n"); WARN_ON(!pdata->buck1_set1); ret = -EIO; goto err_out; } /* Check if SET2 is not equal to 0 */ if (!pdata->buck1_set2) { - printk(KERN_ERR "MAX8998 SET2 GPIO defined as 0 !\n"); + dev_err(&pdev->dev, + "MAX8998 SET2 GPIO defined as 0 !\n"); WARN_ON(!pdata->buck1_set2); ret = -EIO; goto err_out; @@ -738,7 +740,8 @@ static int max8998_pmic_probe(struct platform_device *pdev) if (gpio_is_valid(pdata->buck2_set3)) { /* Check if SET3 is not equal to 0 */ if (!pdata->buck2_set3) { - printk(KERN_ERR "MAX8998 SET3 GPIO defined as 0 !\n"); + dev_err(&pdev->dev, + "MAX8998 SET3 GPIO defined as 0 !\n"); WARN_ON(!pdata->buck2_set3); ret = -EIO; goto err_out; |