]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
power_supply: charger-manager: Fix dereferencing of ERR_PTR
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Tue, 24 Mar 2015 07:58:43 +0000 (08:58 +0100)
committerSebastian Reichel <sre@kernel.org>
Tue, 24 Mar 2015 12:40:14 +0000 (13:40 +0100)
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>
drivers/power/charger-manager.c

index 5933c1a585f4938d3c158fd2cc03c5ce01d0edc9..0aed13f908914a5dfdf0b9303ff95587e7552492 100644 (file)
@@ -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);
        }