---

yaml --- r: 309685 b: refs/heads/master c: d72bade h: refs/heads/master i: 309683: ca1f6d3 v: v3
git-mirror · May 5, 2012 · d37dc52 · d37dc52
1 parent 523442a
commit d37dc52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 055d7f0f29b2af6ec8fd5da9f0ce27b9e9e63436
+refs/heads/master: d72bade76d11da661d76aec5801567d573f39fea
diff --git a/trunk/drivers/power/smb347-charger.c b/trunk/drivers/power/smb347-charger.c
@@ -925,10 +925,6 @@ static int smb347_irq_init(struct smb347_charger *smb)
 	if (ret < 0)
 		goto fail_readonly;
 
-	ret = smb347_irq_enable(smb);
-	if (ret < 0)
-		goto fail_readonly;
-
 	smb347_set_writable(smb, false);
 	smb->client->irq = irq;
 	return 0;
@@ -1241,6 +1237,8 @@ static int smb347_probe(struct i2c_client *client,
 		if (ret < 0) {
 			dev_warn(dev, "failed to initialize IRQ: %d\n", ret);
 			dev_warn(dev, "disabling IRQ support\n");
+		} else {
+			smb347_irq_enable(smb);
 		}
 	}