From 13884516d3083edcf4efae767d2339394cd1a78d Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Sun, 20 May 2012 21:48:48 +0530 Subject: [PATCH] --- yaml --- r: 302321 b: refs/heads/master c: 7e9a57e6267591ddfdd3beaf26f21b5257c5fff8 h: refs/heads/master i: 302319: 9974518cb084cd47947eaf323235d4a6b9914173 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps65910-regulator.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a1de4ac76ad..17a7c6dba228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fc3815e26efd044c1a1d0770b4335cd00c833c0 +refs/heads/master: 7e9a57e6267591ddfdd3beaf26f21b5257c5fff8 diff --git a/trunk/drivers/regulator/tps65910-regulator.c b/trunk/drivers/regulator/tps65910-regulator.c index 521c9252be18..11af48e7186a 100644 --- a/trunk/drivers/regulator/tps65910-regulator.c +++ b/trunk/drivers/regulator/tps65910-regulator.c @@ -1101,7 +1101,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data( matches = tps65911_matches; break; default: - pr_err("Invalid tps chip version\n"); + dev_err(&pdev->dev, "Invalid tps chip version\n"); return NULL; } @@ -1150,12 +1150,16 @@ static __devinit int tps65910_probe(struct platform_device *pdev) if (!pmic_plat_data && tps65910->dev->of_node) pmic_plat_data = tps65910_parse_dt_reg_data(pdev); - if (!pmic_plat_data) + if (!pmic_plat_data) { + dev_err(&pdev->dev, "Platform data not found\n"); return -EINVAL; + } pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL); - if (!pmic) + if (!pmic) { + dev_err(&pdev->dev, "Memory allocation failed for pmic\n"); return -ENOMEM; + } mutex_init(&pmic->mutex); pmic->mfd = tps65910; @@ -1179,7 +1183,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) info = tps65911_regs; break; default: - pr_err("Invalid tps chip version\n"); + dev_err(&pdev->dev, "Invalid tps chip version\n"); return -ENODEV; }