diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-08-31 21:27:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 11:39:10 -0700 |
| commit | a930363881c225fb52824145d1ba8f1a8c447dd8 (patch) | |
| tree | 1e6996560b2cdf9d3978a085bdd1b2ebb4a934a7 /drivers/video/riva | |
| parent | 4cfb04a9d3d6865d932d02616b27b89d3a634026 (diff) | |
| download | linux-stable-a930363881c225fb52824145d1ba8f1a8c447dd8.tar.gz linux-stable-a930363881c225fb52824145d1ba8f1a8c447dd8.tar.bz2 linux-stable-a930363881c225fb52824145d1ba8f1a8c447dd8.zip | |
[PATCH] backlight last round of fixes
Fix some more problems (inverted use of semaphores in some places). He
also moved my checks into within the protected section which is better.
Signed-off-by: Michael Hanselmann <linux-kernel@hansmi.ch>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 90363943bd57..8ddb47a56b07 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -354,14 +354,15 @@ static struct backlight_properties riva_bl_data = { static void riva_bl_set_power(struct fb_info *info, int power) { - if (info->bl_dev == NULL) - return; - mutex_lock(&info->bl_mutex); - up(&info->bl_dev->sem); - info->bl_dev->props->power = power; - __riva_bl_update_status(info->bl_dev); - down(&info->bl_dev->sem); + + if (info->bl_dev) { + down(&info->bl_dev->sem); + info->bl_dev->props->power = power; + __riva_bl_update_status(info->bl_dev); + up(&info->bl_dev->sem); + } + mutex_unlock(&info->bl_mutex); } @@ -396,11 +397,11 @@ static void riva_bl_init(struct riva_par *par) 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL); mutex_unlock(&info->bl_mutex); - up(&bd->sem); + down(&bd->sem); bd->props->brightness = riva_bl_data.max_brightness; bd->props->power = FB_BLANK_UNBLANK; bd->props->update_status(bd); - down(&bd->sem); + up(&bd->sem); #ifdef CONFIG_PMAC_BACKLIGHT mutex_lock(&pmac_backlight_mutex); |