Prev: linux-next: manual merge of the wireless tree with Linus' tree
Next: [PATCH] max8925_bl: properly unregisters a backlight device object in error handling
From: Axel Lin on 9 May 2010 21:30
This patch includes below fixes:
1. fixes a memory leak by kfree(data) in the case of data->port < 0.
2. properly unregisters a previously registered backlight device object
in error handling

Signed-off-by: Axel Lin <axel.lin(a)gmail.com>
---
drivers/video/backlight/88pm860x_bl.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/video/backlight/88pm860x_bl.c
b/drivers/video/backlight/88pm860x_bl.c
index 68d2518..38ffc3f 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -222,6 +222,7 @@ static int pm860x_backlight_probe(struct
platform_device *pdev)
data->port = __check_device(pdata, name);
if (data->port < 0) {
dev_err(&pdev->dev, "wrong platform data is assigned");
+ kfree(data);
return -EINVAL;
}

@@ -266,6 +267,7 @@ static int pm860x_backlight_probe(struct
platform_device *pdev)
backlight_update_status(bl);
return 0;
out:
+ backlight_device_unregister(bl);
kfree(data);
return ret;
}
--
1.5.4.3



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: manual merge of the wireless tree with Linus' tree
Next: [PATCH] max8925_bl: properly unregisters a backlight device object in error handling