From: Colin Ian King Date: Sun, 28 Feb 2016 19:57:58 +0000 (+0000) Subject: power_supply: 88pm860x_charger: do not pass NULL to power_supply_put X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9761dca68c66f6e1305f9c3d5bb5a054512050b3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git power_supply: 88pm860x_charger: do not pass NULL to power_supply_put In the case where power_supply_get_by_name returns NULL the current error return path calls power_supply_put with a NULL psy which will cause a null pointer dereference. Avoid this with an immediate return. Signed-off-by: Colin Ian King Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c index 297e72dc70e6..2b82e44d9027 100644 --- 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;