From 57e0c06877da24f6e863c79e27fbdb8915ffc72f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 25 Apr 2012 10:09:46 +0800 Subject: [PATCH] --- yaml --- r: 308728 b: refs/heads/master c: bbf6adc10cb2d5a1345cc66e61b3891d42a9afbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl6040-core.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cbf971c9237b..fc5ed86d7317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ef4619c74ef1e24e9ee340f95ee922f970cde54 +refs/heads/master: bbf6adc10cb2d5a1345cc66e61b3891d42a9afbe diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040-core.c index 2d6bedadca09..493f4a692747 100644 --- a/trunk/drivers/mfd/twl6040-core.c +++ b/trunk/drivers/mfd/twl6040-core.c @@ -524,7 +524,7 @@ static int __devinit twl6040_probe(struct i2c_client *client, goto err; } - twl6040->regmap = regmap_init_i2c(client, &twl6040_regmap_config); + twl6040->regmap = devm_regmap_init_i2c(client, &twl6040_regmap_config); if (IS_ERR(twl6040->regmap)) { ret = PTR_ERR(twl6040->regmap); goto err; @@ -623,7 +623,6 @@ static int __devinit twl6040_probe(struct i2c_client *client, gpio_free(twl6040->audpwron); gpio1_err: i2c_set_clientdata(client, NULL); - regmap_exit(twl6040->regmap); err: return ret; } @@ -643,7 +642,6 @@ static int __devexit twl6040_remove(struct i2c_client *client) mfd_remove_devices(&client->dev); i2c_set_clientdata(client, NULL); - regmap_exit(twl6040->regmap); return 0; }