aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty/aty128fb.c
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-02-08 17:25:09 -0500
committerRichard Purdie <rpurdie@rpsys.net>2007-02-20 03:38:45 -0500
commit28ee086d5b36aab2931f6740e409bb0fb6c65e5f (patch)
tree0a308c80affcc39c2c869f29f1109e5ee9d6140f /drivers/video/aty/aty128fb.c
parenta8db3c1948eb30cd6988b5b96b654f591e6280b1 (diff)
backlight: Fix external uses of backlight internal semaphore
backlight_device->sem has a very specific use as documented in the header file. The external users of this are using it for a different reason, to serialise access to the update_status() method. backlight users were supposed to implement their own internal serialisation of update_status() if needed but everyone is doing things differently and incorrectly. Therefore add a global mutex to take care of serialisation for everyone, once and for all. Locking for get_brightness remains optional since most users don't need it. Also update the lcd class in a similar way. Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Diffstat (limited to 'drivers/video/aty/aty128fb.c')
-rw-r--r--drivers/video/aty/aty128fb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 1fa211c0d7bb..5d8f73b2b66f 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1807,10 +1807,8 @@ static void aty128_bl_set_power(struct fb_info *info, int power)
1807 mutex_lock(&info->bl_mutex); 1807 mutex_lock(&info->bl_mutex);
1808 1808
1809 if (info->bl_dev) { 1809 if (info->bl_dev) {
1810 down(&info->bl_dev->sem);
1811 info->bl_dev->props->power = power; 1810 info->bl_dev->props->power = power;
1812 __aty128_bl_update_status(info->bl_dev); 1811 __aty128_bl_update_status(info->bl_dev);
1813 up(&info->bl_dev->sem);
1814 } 1812 }
1815 1813
1816 mutex_unlock(&info->bl_mutex); 1814 mutex_unlock(&info->bl_mutex);
@@ -1847,11 +1845,9 @@ static void aty128_bl_init(struct aty128fb_par *par)
1847 219 * FB_BACKLIGHT_MAX / MAX_LEVEL); 1845 219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
1848 mutex_unlock(&info->bl_mutex); 1846 mutex_unlock(&info->bl_mutex);
1849 1847
1850 down(&bd->sem);
1851 bd->props->brightness = aty128_bl_data.max_brightness; 1848 bd->props->brightness = aty128_bl_data.max_brightness;
1852 bd->props->power = FB_BLANK_UNBLANK; 1849 bd->props->power = FB_BLANK_UNBLANK;
1853 bd->props->update_status(bd); 1850 backlight_update_status(bd);
1854 up(&bd->sem);
1855 1851
1856#ifdef CONFIG_PMAC_BACKLIGHT 1852#ifdef CONFIG_PMAC_BACKLIGHT
1857 mutex_lock(&pmac_backlight_mutex); 1853 mutex_lock(&pmac_backlight_mutex);