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 8877b83..ba3638e 100644 (file)
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -1046,7 +1046,14 @@ static int __devinit compal_probe(struct platform_device *pdev)
 
        /* 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) {
+               hwmon_device_unregister(data->hwmon_dev);
+               sysfs_remove_group(&pdev->dev.kobj,
+                               &compal_attribute_group);
+               kfree(data);
+               return err;
+       }
 
        platform_set_drvdata(pdev, data);