Merge tag 'for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[firefly-linux-kernel-4.4.55.git] / drivers / power / bq2415x_charger.c

diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index ec212b5be755c68cf28313fafe24910c2d0cfc03..4afd76848bce5bac52948e62c7c0bdf5aba79fa0 100644 (file)
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -1704,7 +1704,7 @@ error_4:
 error_3:
        bq2415x_power_supply_exit(bq);
 error_2:
-       if (bq->notify_node)
+       if (bq && bq->notify_node)
                of_node_put(bq->notify_node);
        kfree(name);
 error_1: