diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-05 09:22:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-05 09:22:26 +0100 |
| commit | 0c15702445eef6ff9dba774fd1995aca10176969 (patch) | |
| tree | 33e865edad4ed4cc1cbb9667717a7261123b5f2a /drivers | |
| parent | 64724ef8bd2a25aa91678c253a5dbfdad1a95662 (diff) | |
| parent | 25971dfe3a9d14c3b91fc51de96d7f48da394c99 (diff) | |
| download | op-kernel-dev-0c15702445eef6ff9dba774fd1995aca10176969.zip op-kernel-dev-0c15702445eef6ff9dba774fd1995aca10176969.tar.gz | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/mx3fb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 21b3692..9894de1 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -1152,11 +1152,11 @@ static struct fb_ops mx3fb_ops = { */ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) { - struct mx3fb_data *drv_data = platform_get_drvdata(pdev); - struct mx3fb_info *mx3_fbi = drv_data->fbi->par; + struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); + struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; acquire_console_sem(); - fb_set_suspend(drv_data->fbi, 1); + fb_set_suspend(mx3fb->fbi, 1); release_console_sem(); if (mx3_fbi->blank == FB_BLANK_UNBLANK) { @@ -1172,16 +1172,16 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) */ static int mx3fb_resume(struct platform_device *pdev) { - struct mx3fb_data *drv_data = platform_get_drvdata(pdev); - struct mx3fb_info *mx3_fbi = drv_data->fbi->par; + struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); + struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; if (mx3_fbi->blank == FB_BLANK_UNBLANK) { sdc_enable_channel(mx3_fbi); - sdc_set_brightness(mx3fb, drv_data->backlight_level); + sdc_set_brightness(mx3fb, mx3fb->backlight_level); } acquire_console_sem(); - fb_set_suspend(drv_data->fbi, 0); + fb_set_suspend(mx3fb->fbi, 0); release_console_sem(); return 0; |
