From d37dc52d9c685a6b660e08364e022c506f0eb4a5 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Mon, 16 Apr 2012 11:48:40 +0300 Subject: [PATCH] --- yaml --- r: 309685 b: refs/heads/master c: d72bade76d11da661d76aec5801567d573f39fea h: refs/heads/master i: 309683: ca1f6d3b2c4dbe2eaf9a23ab5872d23236a791e9 v: v3 --- [refs] | 2 +- trunk/drivers/power/smb347-charger.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a56ad806c05..2ceba7bf6d75 100644 --- 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 index 18d53748e66d..de6898f5d166 100644 --- 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); } }