lkml.org 
[lkml]   [2013]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 02/35] mfd: ab8500-gpadc: Allow tvout regulator to be missing
Date
From: Jonas Aaberg <jonas.aberg@stericsson.com>

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org
---
drivers/mfd/ab8500-gpadc.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 9ed3afc..34c1d04 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -140,6 +140,9 @@ struct ab8500_gpadc *ab8500_gpadc_get(char *name)
{
struct ab8500_gpadc *gpadc;

+ if (list_empty(&ab8500_gpadc_list))
+ return NULL;
+
list_for_each_entry(gpadc, &ab8500_gpadc_list, node) {
if (!strcmp(name, dev_name(gpadc->dev)))
return gpadc;
@@ -587,7 +590,8 @@ static int ab8500_gpadc_runtime_suspend(struct device *dev)
{
struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);

- regulator_disable(gpadc->regu);
+ if (gpadc->regu)
+ regulator_disable(gpadc->regu);
return 0;
}

@@ -595,7 +599,8 @@ static int ab8500_gpadc_runtime_resume(struct device *dev)
{
struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);

- regulator_enable(gpadc->regu);
+ if (gpadc->regu)
+ regulator_enable(gpadc->regu);
return 0;
}

@@ -670,9 +675,8 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
/* VTVout LDO used to power up ab8500-GPADC */
gpadc->regu = regulator_get(&pdev->dev, "vddadc");
if (IS_ERR(gpadc->regu)) {
- ret = PTR_ERR(gpadc->regu);
- dev_err(gpadc->dev, "failed to get vtvout LDO\n");
- goto fail_irq;
+ dev_warn(gpadc->dev, "failed to get vtvout LDO\n");
+ gpadc->regu = NULL;
}

platform_set_drvdata(pdev, gpadc);
@@ -688,8 +692,6 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
list_add_tail(&gpadc->node, &ab8500_gpadc_list);
dev_dbg(gpadc->dev, "probe success\n");
return 0;
-fail_irq:
- free_irq(gpadc->irq, gpadc);
fail:
kfree(gpadc);
gpadc = NULL;
@@ -708,7 +710,8 @@ static int ab8500_gpadc_remove(struct platform_device *pdev)
pm_runtime_get_sync(gpadc->dev);
pm_runtime_disable(gpadc->dev);

- regulator_disable(gpadc->regu);
+ if (gpadc->regu)
+ regulator_disable(gpadc->regu);

pm_runtime_set_suspended(gpadc->dev);

--
1.7.10.4


\
 
 \ /
  Last update: 2013-02-15 15:21    [W:0.360 / U:0.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site