diff options
-rw-r--r-- | drivers/video/backlight/wm831x_bl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c index 4e915f5eca99..5d365deb5f82 100644 --- a/drivers/video/backlight/wm831x_bl.c +++ b/drivers/video/backlight/wm831x_bl.c | |||
@@ -186,7 +186,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
186 | if (ret < 0) | 186 | if (ret < 0) |
187 | return ret; | 187 | return ret; |
188 | 188 | ||
189 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 189 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
190 | if (data == NULL) | 190 | if (data == NULL) |
191 | return -ENOMEM; | 191 | return -ENOMEM; |
192 | 192 | ||
@@ -200,7 +200,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
200 | &wm831x_backlight_ops, &props); | 200 | &wm831x_backlight_ops, &props); |
201 | if (IS_ERR(bl)) { | 201 | if (IS_ERR(bl)) { |
202 | dev_err(&pdev->dev, "failed to register backlight\n"); | 202 | dev_err(&pdev->dev, "failed to register backlight\n"); |
203 | kfree(data); | ||
204 | return PTR_ERR(bl); | 203 | return PTR_ERR(bl); |
205 | } | 204 | } |
206 | 205 | ||
@@ -211,7 +210,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
211 | /* Disable the DCDC if it was started so we can bootstrap */ | 210 | /* Disable the DCDC if it was started so we can bootstrap */ |
212 | wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0); | 211 | wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0); |
213 | 212 | ||
214 | |||
215 | backlight_update_status(bl); | 213 | backlight_update_status(bl); |
216 | 214 | ||
217 | return 0; | 215 | return 0; |
@@ -220,10 +218,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
220 | static int wm831x_backlight_remove(struct platform_device *pdev) | 218 | static int wm831x_backlight_remove(struct platform_device *pdev) |
221 | { | 219 | { |
222 | struct backlight_device *bl = platform_get_drvdata(pdev); | 220 | struct backlight_device *bl = platform_get_drvdata(pdev); |
223 | struct wm831x_backlight_data *data = bl_get_data(bl); | ||
224 | 221 | ||
225 | backlight_device_unregister(bl); | 222 | backlight_device_unregister(bl); |
226 | kfree(data); | ||
227 | return 0; | 223 | return 0; |
228 | } | 224 | } |
229 | 225 | ||