diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/backlight/adp5520_bl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c index 2e630bf1164c..4911ea7989c8 100644 --- a/drivers/video/backlight/adp5520_bl.c +++ b/drivers/video/backlight/adp5520_bl.c | |||
@@ -289,7 +289,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) | |||
289 | struct adp5520_bl *data; | 289 | struct adp5520_bl *data; |
290 | int ret = 0; | 290 | int ret = 0; |
291 | 291 | ||
292 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 292 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
293 | if (data == NULL) | 293 | if (data == NULL) |
294 | return -ENOMEM; | 294 | return -ENOMEM; |
295 | 295 | ||
@@ -298,7 +298,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) | |||
298 | 298 | ||
299 | if (data->pdata == NULL) { | 299 | if (data->pdata == NULL) { |
300 | dev_err(&pdev->dev, "missing platform data\n"); | 300 | dev_err(&pdev->dev, "missing platform data\n"); |
301 | kfree(data); | ||
302 | return -ENODEV; | 301 | return -ENODEV; |
303 | } | 302 | } |
304 | 303 | ||
@@ -314,7 +313,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) | |||
314 | &adp5520_bl_ops, &props); | 313 | &adp5520_bl_ops, &props); |
315 | if (IS_ERR(bl)) { | 314 | if (IS_ERR(bl)) { |
316 | dev_err(&pdev->dev, "failed to register backlight\n"); | 315 | dev_err(&pdev->dev, "failed to register backlight\n"); |
317 | kfree(data); | ||
318 | return PTR_ERR(bl); | 316 | return PTR_ERR(bl); |
319 | } | 317 | } |
320 | 318 | ||
@@ -326,7 +324,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) | |||
326 | if (ret) { | 324 | if (ret) { |
327 | dev_err(&pdev->dev, "failed to register sysfs\n"); | 325 | dev_err(&pdev->dev, "failed to register sysfs\n"); |
328 | backlight_device_unregister(bl); | 326 | backlight_device_unregister(bl); |
329 | kfree(data); | ||
330 | } | 327 | } |
331 | 328 | ||
332 | platform_set_drvdata(pdev, bl); | 329 | platform_set_drvdata(pdev, bl); |
@@ -348,7 +345,6 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev) | |||
348 | &adp5520_bl_attr_group); | 345 | &adp5520_bl_attr_group); |
349 | 346 | ||
350 | backlight_device_unregister(bl); | 347 | backlight_device_unregister(bl); |
351 | kfree(data); | ||
352 | 348 | ||
353 | return 0; | 349 | return 0; |
354 | } | 350 | } |