|
@@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- bl = kzalloc(sizeof(*bl), GFP_KERNEL);
|
|
|
+ bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
|
|
|
if (!bl) {
|
|
|
dev_err(&pdev->dev,
|
|
|
"failed to allocate memory for backlight\n");
|
|
@@ -317,8 +317,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
|
|
|
&lm3533_bl_ops, &props);
|
|
|
if (IS_ERR(bd)) {
|
|
|
dev_err(&pdev->dev, "failed to register backlight device\n");
|
|
|
- ret = PTR_ERR(bd);
|
|
|
- goto err_free;
|
|
|
+ return PTR_ERR(bd);
|
|
|
}
|
|
|
|
|
|
bl->bd = bd;
|
|
@@ -348,8 +347,6 @@ err_sysfs_remove:
|
|
|
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
|
|
err_unregister:
|
|
|
backlight_device_unregister(bd);
|
|
|
-err_free:
|
|
|
- kfree(bl);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -367,7 +364,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
|
|
|
lm3533_ctrlbank_disable(&bl->cb);
|
|
|
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
|
|
backlight_device_unregister(bd);
|
|
|
- kfree(bl);
|
|
|
|
|
|
return 0;
|
|
|
}
|