git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compal-laptop: Check return value of power_supply_register
[pandora-kernel.git]
/
drivers
/
platform
/
x86
/
compal-laptop.c
diff --git
a/drivers/platform/x86/compal-laptop.c
b/drivers/platform/x86/compal-laptop.c
index
15c0fab
..
bceb30b
100644
(file)
--- a/
drivers/platform/x86/compal-laptop.c
+++ b/
drivers/platform/x86/compal-laptop.c
@@
-1026,9
+1026,9
@@
static int compal_probe(struct platform_device *pdev)
if (err)
return err;
if (err)
return err;
- hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
- "compal", data,
- compal_hwmon_groups);
+ hwmon_dev =
devm_
hwmon_device_register_with_groups(&pdev->dev,
+
"compal", data,
+
compal_hwmon_groups);
if (IS_ERR(hwmon_dev)) {
err = PTR_ERR(hwmon_dev);
goto remove;
if (IS_ERR(hwmon_dev)) {
err = PTR_ERR(hwmon_dev);
goto remove;
@@
-1036,7
+1036,9
@@
static int compal_probe(struct platform_device *pdev)
/* Power supply */
initialize_power_supply_data(data);
/* Power supply */
initialize_power_supply_data(data);
- power_supply_register(&compal_device->dev, &data->psy);
+ err = power_supply_register(&compal_device->dev, &data->psy);
+ if (err < 0)
+ goto remove;
platform_set_drvdata(pdev, data);
platform_set_drvdata(pdev, data);