Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / power / 88pm860x_charger.c

diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 297e72dc70e603aede8caa31d6f8d3cec22e8a61..2b82e44d9027292c28a176862e9d51f4737532f2 100644 (file)
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -435,7 +435,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data)
 
        psy = power_supply_get_by_name(pm860x_supplied_to[0]);
        if (!psy)
-               goto out;
+               return IRQ_HANDLED;
        ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);
        if (ret)
                goto out;