[PATCH] 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 <redacted>
Reported-by: Dan Carpenter <redacted>
---
 drivers/power/charger-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 5933c1a585f4..0aed13f90891 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c

@@ -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);
 	}
 

-- 
1.9.1

Hi Krzysztof,

On Tue, Mar 24, 2015 at 08:58:43AM +0100, Krzysztof Kozlowski wrote:

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 <redacted>
Reported-by: Dan Carpenter <redacted>

Thanks, pulled.

-- Sebastian