aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/ld9040.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-07-25 20:12:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 23:57:08 -0400
commitef22f6a70c9186c8e25f757b0e8f7374b37f69bf (patch)
tree2a2dcaa322941a54059421a96d462fc3a8585354 /drivers/video/backlight/ld9040.c
parenta4c8aaa559733d03cb6bb4fa62c25ae756c53e94 (diff)
backlight: set backlight type and max_brightness before backlights are registered
Since commit a19a6ee "backlight: Allow properties to be passed at registration" and commit bb7ca74 "backlight: add backlight type", we can set backlight type and max_brightness before backlights are registered. Some newly added drivers did not set it properly, let's fix it. Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Matthew Garrett <mjg@redhat.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Donghwa Lee <dh09.lee@samsung.com> Cc: InKi Dae <inki.dae@samsung.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/backlight/ld9040.c')
-rw-r--r--drivers/video/backlight/ld9040.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 62bcde3c97f..5934655eb1f 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -668,6 +668,7 @@ static int ld9040_probe(struct spi_device *spi)
668 struct ld9040 *lcd = NULL; 668 struct ld9040 *lcd = NULL;
669 struct lcd_device *ld = NULL; 669 struct lcd_device *ld = NULL;
670 struct backlight_device *bd = NULL; 670 struct backlight_device *bd = NULL;
671 struct backlight_properties props;
671 672
672 lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL); 673 lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL);
673 if (!lcd) 674 if (!lcd)
@@ -699,14 +700,17 @@ static int ld9040_probe(struct spi_device *spi)
699 700
700 lcd->ld = ld; 701 lcd->ld = ld;
701 702
703 memset(&props, 0, sizeof(struct backlight_properties));
704 props.type = BACKLIGHT_RAW;
705 props.max_brightness = MAX_BRIGHTNESS;
706
702 bd = backlight_device_register("ld9040-bl", &spi->dev, 707 bd = backlight_device_register("ld9040-bl", &spi->dev,
703 lcd, &ld9040_backlight_ops, NULL); 708 lcd, &ld9040_backlight_ops, &props);
704 if (IS_ERR(bd)) { 709 if (IS_ERR(bd)) {
705 ret = PTR_ERR(bd); 710 ret = PTR_ERR(bd);
706 goto out_unregister_lcd; 711 goto out_unregister_lcd;
707 } 712 }
708 713
709 bd->props.max_brightness = MAX_BRIGHTNESS;
710 bd->props.brightness = MAX_BRIGHTNESS; 714 bd->props.brightness = MAX_BRIGHTNESS;
711 lcd->bd = bd; 715 lcd->bd = bd;
712 716