---

yaml --- r: 309675 b: refs/heads/master c: 243e352 h: refs/heads/master i: 309673: ad19092 309671: 6f6d1f9 v: v3
git-mirror · May 5, 2012 · 06466ac · 06466ac
1 parent 7e8dafb
commit 06466ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d4ed4e27a4cb180af395fa3d7aa98d79f3d3015
+refs/heads/master: 243e3527ffbda96434429e618324f80ca0d98902
diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c
@@ -690,6 +690,12 @@ static int __devinit max17042_probe(struct i2c_client *client,
 		max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);
 	}
 
+	ret = power_supply_register(&client->dev, &chip->battery);
+	if (ret) {
+		dev_err(&client->dev, "failed: power supply register\n");
+		return ret;
+	}
+
 	if (client->irq) {
 		ret = request_threaded_irq(client->irq, NULL,
 						max17042_thread_handler,
@@ -706,18 +712,14 @@ static int __devinit max17042_probe(struct i2c_client *client,
 	}
 
 	reg = max17042_read_reg(chip->client, MAX17042_STATUS);
-
 	if (reg & STATUS_POR_BIT) {
 		INIT_WORK(&chip->work, max17042_init_worker);
 		schedule_work(&chip->work);
 	} else {
 		chip->init_complete = 1;
 	}
 
-	ret = power_supply_register(&client->dev, &chip->battery);
-	if (ret)
-		dev_err(&client->dev, "failed: power supply register\n");
-	return ret;
+	return 0;
 }
 
 static int __devexit max17042_remove(struct i2c_client *client)