From d43da9890909d88b0dda1f15226114c3b79a0e0f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 25 Apr 2012 09:30:36 +0800 Subject: [PATCH] --- yaml --- r: 308723 b: refs/heads/master c: b683a0a675560307ebc458cf9044d98d27820b7c h: refs/heads/master i: 308721: cfec8f04044ab9e85b1f83b56e21d450d8e5c0da 308719: a57507bbc53a48494d6f89583aedcee71a7c5c1a v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65090.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 57834884f51d..b2e1362ff32b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1379f49ea91a28f5c023d041aab785c3de60c65d +refs/heads/master: b683a0a675560307ebc458cf9044d98d27820b7c diff --git a/trunk/drivers/mfd/tps65090.c b/trunk/drivers/mfd/tps65090.c index 6dc4c345ea68..d9940870a688 100644 --- a/trunk/drivers/mfd/tps65090.c +++ b/trunk/drivers/mfd/tps65090.c @@ -297,10 +297,10 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client, tps65090->rmap = regmap_init_i2c(tps65090->client, &tps65090_regmap_config); if (IS_ERR(tps65090->rmap)) { - dev_err(&client->dev, "regmap_init failed with err: %ld\n", - PTR_ERR(tps65090->rmap)); + ret = PTR_ERR(tps65090->rmap); + dev_err(&client->dev, "regmap_init failed with err: %d\n", ret); goto err_irq_exit; - }; + } ret = mfd_add_devices(tps65090->dev, -1, tps65090s, ARRAY_SIZE(tps65090s), NULL, 0);