aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/chipsfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/chipsfb.c')
-rw-r--r--drivers/video/chipsfb.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 73cb426bf2d7..9a656bc6295c 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -153,13 +153,11 @@ static int chipsfb_blank(int blank, struct fb_info *info)
153 * useful at blank = 1 too (saves battery, extends backlight 153 * useful at blank = 1 too (saves battery, extends backlight
154 * life) 154 * life)
155 */ 155 */
156 down(&pmac_backlight->sem);
157 if (blank) 156 if (blank)
158 pmac_backlight->props->power = FB_BLANK_POWERDOWN; 157 pmac_backlight->props->power = FB_BLANK_POWERDOWN;
159 else 158 else
160 pmac_backlight->props->power = FB_BLANK_UNBLANK; 159 pmac_backlight->props->power = FB_BLANK_UNBLANK;
161 pmac_backlight->props->update_status(pmac_backlight); 160 backlight_update_status(pmac_backlight);
162 up(&pmac_backlight->sem);
163 } 161 }
164 162
165 mutex_unlock(&pmac_backlight_mutex); 163 mutex_unlock(&pmac_backlight_mutex);
@@ -415,10 +413,8 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
415 /* turn on the backlight */ 413 /* turn on the backlight */
416 mutex_lock(&pmac_backlight_mutex); 414 mutex_lock(&pmac_backlight_mutex);
417 if (pmac_backlight) { 415 if (pmac_backlight) {
418 down(&pmac_backlight->sem);
419 pmac_backlight->props->power = FB_BLANK_UNBLANK; 416 pmac_backlight->props->power = FB_BLANK_UNBLANK;
420 pmac_backlight->props->update_status(pmac_backlight); 417 backlight_update_status(pmac_backlight);
421 up(&pmac_backlight->sem);
422 } 418 }
423 mutex_unlock(&pmac_backlight_mutex); 419 mutex_unlock(&pmac_backlight_mutex);
424#endif /* CONFIG_PMAC_BACKLIGHT */ 420#endif /* CONFIG_PMAC_BACKLIGHT */