diff --git a/[refs] b/[refs]
index 08157f1e40a1..9c246d8248eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 243e3527ffbda96434429e618324f80ca0d98902
+refs/heads/master: e5ba50bc3b9311256ae6a6620e7708fb25d1f6e2
diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c
index b4c8af016278..8d28006322e9 100644
--- a/trunk/drivers/power/max17042_battery.c
+++ b/trunk/drivers/power/max17042_battery.c
@@ -706,9 +706,11 @@ static int __devinit max17042_probe(struct i2c_client *client,
 			reg |= CONFIG_ALRT_BIT_ENBL;
 			max17042_write_reg(client, MAX17042_CONFIG, reg);
 			max17042_set_soc_threshold(chip, 1);
-		} else
+		} else {
+			client->irq = 0;
 			dev_err(&client->dev, "%s(): cannot get IRQ\n",
 				__func__);
+		}
 	}
 
 	reg = max17042_read_reg(chip->client, MAX17042_STATUS);