---

yaml --- r: 308723 b: refs/heads/master c: b683a0a h: refs/heads/master i: 308721: cfec8f0 308719: a57507b v: v3
git-mirror · May 9, 2012 · d43da98 · d43da98
1 parent 09f39f2
commit d43da98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);