Commit ecf896b9 authored Mar 24, 2015 by Krzysztof Kozlowski Committed by Sebastian Reichel Mar 24, 2015

power_supply: charger-manager: Fix dereferencing of ERR_PTR



If power_supply_register() fails do not dereference returned ERR_PTR.
The pointer was dereferenced to print name of battery which registration
failed. Instead use the name from the power supply description passed to
the power_supply_register() function.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent fbea947c

drivers/power/charger-manager.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1772,7 +1772,7 @@ static int charger_manager_probe(struct platform_device *pdev)
		&psy_cfg);
		if (IS_ERR(cm->charger_psy)) {
		dev_err(&pdev->dev, "Cannot register charger-manager with name \"%s\"\n",
		cm->charger_psy->desc->name);
		cm->charger_psy_desc.name);
		return PTR_ERR(cm->charger_psy);
		}