diff options
Diffstat (limited to 'drivers/video/backlight/wm831x_bl.c')
| -rw-r--r-- | drivers/video/backlight/wm831x_bl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c index e32add37a203..08fd87f3aecc 100644 --- a/drivers/video/backlight/wm831x_bl.c +++ b/drivers/video/backlight/wm831x_bl.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 15 | #include <linux/backlight.h> | 15 | #include <linux/backlight.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/mfd/wm831x/core.h> | 18 | #include <linux/mfd/wm831x/core.h> |
| 18 | #include <linux/mfd/wm831x/pdata.h> | 19 | #include <linux/mfd/wm831x/pdata.h> |
| @@ -125,6 +126,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
| 125 | struct wm831x_backlight_pdata *pdata; | 126 | struct wm831x_backlight_pdata *pdata; |
| 126 | struct wm831x_backlight_data *data; | 127 | struct wm831x_backlight_data *data; |
| 127 | struct backlight_device *bl; | 128 | struct backlight_device *bl; |
| 129 | struct backlight_properties props; | ||
| 128 | int ret, i, max_isel, isink_reg, dcdc_cfg; | 130 | int ret, i, max_isel, isink_reg, dcdc_cfg; |
| 129 | 131 | ||
| 130 | /* We need platform data */ | 132 | /* We need platform data */ |
| @@ -191,15 +193,15 @@ static int wm831x_backlight_probe(struct platform_device *pdev) | |||
| 191 | data->current_brightness = 0; | 193 | data->current_brightness = 0; |
| 192 | data->isink_reg = isink_reg; | 194 | data->isink_reg = isink_reg; |
| 193 | 195 | ||
| 194 | bl = backlight_device_register("wm831x", &pdev->dev, | 196 | props.max_brightness = max_isel; |
| 195 | data, &wm831x_backlight_ops); | 197 | bl = backlight_device_register("wm831x", &pdev->dev, data, |
| 198 | &wm831x_backlight_ops, &props); | ||
| 196 | if (IS_ERR(bl)) { | 199 | if (IS_ERR(bl)) { |
| 197 | dev_err(&pdev->dev, "failed to register backlight\n"); | 200 | dev_err(&pdev->dev, "failed to register backlight\n"); |
| 198 | kfree(data); | 201 | kfree(data); |
| 199 | return PTR_ERR(bl); | 202 | return PTR_ERR(bl); |
| 200 | } | 203 | } |
| 201 | 204 | ||
| 202 | bl->props.max_brightness = max_isel; | ||
| 203 | bl->props.brightness = max_isel; | 205 | bl->props.brightness = max_isel; |
| 204 | 206 | ||
| 205 | platform_set_drvdata(pdev, bl); | 207 | platform_set_drvdata(pdev, bl); |
