Commit 5bcb5087 authored by Linus Walleij's avatar Linus Walleij Committed by Sebastian Reichel
Browse files

power: supply: ab8500: Avoid NULL pointers 



Sometimes the code will crash because we haven't enabled
AC or USB charging and thus not created the corresponding
psy device. Fix it by checking that it is there before
notifying.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 7e2bb83c

drivers/power/supply/ab8500_charger.c

+17 −1
Original line number Diff line number Diff line
@@ -415,6 +415,14 @@ static void ab8500_enable_disable_sw_fallback(struct ab8500_charger *di, 
static void ab8500_power_supply_changed(struct ab8500_charger *di,

					struct power_supply *psy)

{

	/*

	 * This happens if we get notifications or interrupts and

	 * the platform has been configured not to support one or

	 * other type of charging.

	 */

	if (!psy)

		return;



	if (di->autopower_cfg) {

		if (!di->usb.charger_connected &&

		    !di->ac.charger_connected &&
@@ -441,7 +449,15 @@ static void ab8500_charger_set_usb_connected(struct ab8500_charger *di, 
		if (!connected)

			di->flags.vbus_drop_end = false;



		sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL, "present");

		/*

		 * Sometimes the platform is configured not to support

		 * USB charging and no psy has been created, but we still

		 * will get these notifications.

		 */

		if (di->usb_chg.psy) {

			sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL,

				     "present");

		}



		if (connected) {

			mutex_lock(&di->charger_attached_mutex);