diff options
Diffstat (limited to 'drivers/video/aty')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 6 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 6 | ||||
-rw-r--r-- | drivers/video/aty/radeon_backlight.c | 4 |
3 files changed, 3 insertions, 13 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); |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5ea5a00e58a3..23deb3566020 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2188,10 +2188,8 @@ static void aty_bl_set_power(struct fb_info *info, int power) | |||
2188 | mutex_lock(&info->bl_mutex); | 2188 | mutex_lock(&info->bl_mutex); |
2189 | 2189 | ||
2190 | if (info->bl_dev) { | 2190 | if (info->bl_dev) { |
2191 | down(&info->bl_dev->sem); | ||
2192 | info->bl_dev->props->power = power; | 2191 | info->bl_dev->props->power = power; |
2193 | __aty_bl_update_status(info->bl_dev); | 2192 | __aty_bl_update_status(info->bl_dev); |
2194 | up(&info->bl_dev->sem); | ||
2195 | } | 2193 | } |
2196 | 2194 | ||
2197 | mutex_unlock(&info->bl_mutex); | 2195 | mutex_unlock(&info->bl_mutex); |
@@ -2224,11 +2222,9 @@ static void aty_bl_init(struct atyfb_par *par) | |||
2224 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); | 2222 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); |
2225 | mutex_unlock(&info->bl_mutex); | 2223 | mutex_unlock(&info->bl_mutex); |
2226 | 2224 | ||
2227 | down(&bd->sem); | ||
2228 | bd->props->brightness = aty_bl_data.max_brightness; | 2225 | bd->props->brightness = aty_bl_data.max_brightness; |
2229 | bd->props->power = FB_BLANK_UNBLANK; | 2226 | bd->props->power = FB_BLANK_UNBLANK; |
2230 | bd->props->update_status(bd); | 2227 | backlight_update_status(bd); |
2231 | up(&bd->sem); | ||
2232 | 2228 | ||
2233 | #ifdef CONFIG_PMAC_BACKLIGHT | 2229 | #ifdef CONFIG_PMAC_BACKLIGHT |
2234 | mutex_lock(&pmac_backlight_mutex); | 2230 | mutex_lock(&pmac_backlight_mutex); |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index 8b66df6f199a..9cfcecac8b5e 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
@@ -194,11 +194,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo) | |||
194 | 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL); | 194 | 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL); |
195 | mutex_unlock(&rinfo->info->bl_mutex); | 195 | mutex_unlock(&rinfo->info->bl_mutex); |
196 | 196 | ||
197 | down(&bd->sem); | ||
198 | bd->props->brightness = radeon_bl_data.max_brightness; | 197 | bd->props->brightness = radeon_bl_data.max_brightness; |
199 | bd->props->power = FB_BLANK_UNBLANK; | 198 | bd->props->power = FB_BLANK_UNBLANK; |
200 | bd->props->update_status(bd); | 199 | backlight_update_status(bd); |
201 | up(&bd->sem); | ||
202 | 200 | ||
203 | #ifdef CONFIG_PMAC_BACKLIGHT | 201 | #ifdef CONFIG_PMAC_BACKLIGHT |
204 | mutex_lock(&pmac_backlight_mutex); | 202 | mutex_lock(&pmac_backlight_mutex); |