lkml.org 
[lkml]   [2011]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/6] mfd: TPS65910: Handle non-existent devices
Date
Attempt to read the first register of the device, if there is no
device return -ENODEV

Signed-off-by: Kyle Manna <kyle.manna@fuel7.com>
---
drivers/mfd/tps65910.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 6f5b8cf..03fb4a7 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -138,6 +138,7 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
struct tps65910_board *pmic_plat_data;
struct tps65910_platform_data *init_data;
int ret = 0;
+ char buff;

pmic_plat_data = dev_get_platdata(&i2c->dev);
if (!pmic_plat_data)
@@ -161,11 +162,17 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
tps65910->write = tps65910_i2c_write;
mutex_init(&tps65910->io_mutex);

- ret = mfd_add_devices(tps65910->dev, -1,
- tps65910s, ARRAY_SIZE(tps65910s),
- NULL, 0);
- if (ret < 0)
+ /* Check that the device is actually there */
+ ret = tps65910_i2c_read(tps65910, 0x0, 1, &buff);
+ if (ret < 0) {
+ ret = -ENODEV;
goto err;
+ }
+
+ ret = mfd_add_devices(tps65910->dev, -1, tps65910s,
+ ARRAY_SIZE(tps65910s), NULL, 0);
+ if (ret < 0)
+ goto err2;

init_data->irq = pmic_plat_data->irq;
init_data->irq_base = pmic_plat_data->irq;
@@ -174,13 +181,14 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,

ret = tps65910_irq_init(tps65910, init_data->irq, init_data);
if (ret < 0)
- goto err;
+ goto err2;

kfree(init_data);
return ret;

-err:
+err2:
mfd_remove_devices(tps65910->dev);
+err:
kfree(tps65910);
kfree(init_data);
return ret;
--
1.7.5.4


\
 
 \ /
  Last update: 2011-10-18 21:03    [W:0.062 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site