diff options
Diffstat (limited to 'drivers/video/backlight/aat2870_bl.c')
-rw-r--r-- | drivers/video/backlight/aat2870_bl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c index 331f1ef1dad5..7ff752288b92 100644 --- a/drivers/video/backlight/aat2870_bl.c +++ b/drivers/video/backlight/aat2870_bl.c | |||
@@ -145,7 +145,9 @@ static int aat2870_bl_probe(struct platform_device *pdev) | |||
145 | goto out; | 145 | goto out; |
146 | } | 146 | } |
147 | 147 | ||
148 | aat2870_bl = kzalloc(sizeof(struct aat2870_bl_driver_data), GFP_KERNEL); | 148 | aat2870_bl = devm_kzalloc(&pdev->dev, |
149 | sizeof(struct aat2870_bl_driver_data), | ||
150 | GFP_KERNEL); | ||
149 | if (!aat2870_bl) { | 151 | if (!aat2870_bl) { |
150 | dev_err(&pdev->dev, | 152 | dev_err(&pdev->dev, |
151 | "Failed to allocate memory for aat2870 backlight\n"); | 153 | "Failed to allocate memory for aat2870 backlight\n"); |
@@ -162,7 +164,7 @@ static int aat2870_bl_probe(struct platform_device *pdev) | |||
162 | dev_err(&pdev->dev, | 164 | dev_err(&pdev->dev, |
163 | "Failed allocate memory for backlight device\n"); | 165 | "Failed allocate memory for backlight device\n"); |
164 | ret = PTR_ERR(bd); | 166 | ret = PTR_ERR(bd); |
165 | goto out_kfree; | 167 | goto out; |
166 | } | 168 | } |
167 | 169 | ||
168 | aat2870_bl->pdev = pdev; | 170 | aat2870_bl->pdev = pdev; |
@@ -199,8 +201,6 @@ static int aat2870_bl_probe(struct platform_device *pdev) | |||
199 | 201 | ||
200 | out_bl_dev_unregister: | 202 | out_bl_dev_unregister: |
201 | backlight_device_unregister(bd); | 203 | backlight_device_unregister(bd); |
202 | out_kfree: | ||
203 | kfree(aat2870_bl); | ||
204 | out: | 204 | out: |
205 | return ret; | 205 | return ret; |
206 | } | 206 | } |
@@ -215,7 +215,6 @@ static int aat2870_bl_remove(struct platform_device *pdev) | |||
215 | backlight_update_status(bd); | 215 | backlight_update_status(bd); |
216 | 216 | ||
217 | backlight_device_unregister(bd); | 217 | backlight_device_unregister(bd); |
218 | kfree(aat2870_bl); | ||
219 | 218 | ||
220 | return 0; | 219 | return 0; |
221 | } | 220 | } |