From 244db16386ebb83fcb7b657b56308338c832558f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 25 Apr 2012 10:03:44 +0800 Subject: [PATCH] --- yaml --- r: 308725 b: refs/heads/master c: 1092e1c761dd0dc92a431085e322956d91d057a6 h: refs/heads/master i: 308723: d43da9890909d88b0dda1f15226114c3b79a0e0f v: v3 --- [refs] | 2 +- trunk/drivers/mfd/s5m-core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a584a3aa08e4..3c0c51e2e37f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8dddc0cfe9f56ed74fd5efde8d0754f5fb73a3f +refs/heads/master: 1092e1c761dd0dc92a431085e322956d91d057a6 diff --git a/trunk/drivers/mfd/s5m-core.c b/trunk/drivers/mfd/s5m-core.c index 48949d998d10..dd170307e60e 100644 --- a/trunk/drivers/mfd/s5m-core.c +++ b/trunk/drivers/mfd/s5m-core.c @@ -114,12 +114,12 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, s5m87xx->wakeup = pdata->wakeup; } - s5m87xx->regmap = regmap_init_i2c(i2c, &s5m_regmap_config); + s5m87xx->regmap = devm_regmap_init_i2c(i2c, &s5m_regmap_config); if (IS_ERR(s5m87xx->regmap)) { ret = PTR_ERR(s5m87xx->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } s5m87xx->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR); @@ -159,7 +159,6 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, mfd_remove_devices(s5m87xx->dev); s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); - regmap_exit(s5m87xx->regmap); return ret; } @@ -170,7 +169,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c) mfd_remove_devices(s5m87xx->dev); s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); - regmap_exit(s5m87xx->regmap); return 0; }