diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-02-28 14:23:55 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 18:46:54 +0100 |
| commit | 61a2af301fa145490868fcf36b4bbea22398f760 (patch) | |
| tree | 1f6fc787a0adb8bddacfbd03c29c2c4916166554 | |
| parent | b3b97473ee07ae8904e9d8fe02914de2188d302c (diff) | |
| download | linux-61a2af301fa145490868fcf36b4bbea22398f760.tar.gz linux-61a2af301fa145490868fcf36b4bbea22398f760.tar.bz2 linux-61a2af301fa145490868fcf36b4bbea22398f760.zip | |
mfd: Return proper error if s5m-core regmap_init_i2c fails
Also remove a redundant semicolon from return statement.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/s5m-core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/s5m-core.c index 578e12e7f679..48949d998d10 100644 --- a/drivers/mfd/s5m-core.c +++ b/drivers/mfd/s5m-core.c @@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(s5m_reg_read); int s5m_bulk_read(struct s5m87xx_dev *s5m87xx, u8 reg, int count, u8 *buf) { - return regmap_bulk_read(s5m87xx->regmap, reg, buf, count);; + return regmap_bulk_read(s5m87xx->regmap, reg, buf, count); } EXPORT_SYMBOL_GPL(s5m_bulk_read); @@ -94,8 +94,7 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, { struct s5m_platform_data *pdata = i2c->dev.platform_data; struct s5m87xx_dev *s5m87xx; - int ret = 0; - int error; + int ret; s5m87xx = devm_kzalloc(&i2c->dev, sizeof(struct s5m87xx_dev), GFP_KERNEL); @@ -117,9 +116,9 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, s5m87xx->regmap = regmap_init_i2c(i2c, &s5m_regmap_config); if (IS_ERR(s5m87xx->regmap)) { - error = PTR_ERR(s5m87xx->regmap); + ret = PTR_ERR(s5m87xx->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", - error); + ret); goto err; } |