mx3fb: Fix compilation with CONFIG_PM
PATCH 1/1 mx3fb: Fix compilation with CONFIG_PM
Hi Guennadi,
The following fixes mx3fb compilation with CONFIG_PM
Sascha
From cb9f64e5c9bc108d6b6bcf78ae19df45107d766c Mon Sep 17 00:00:00 2001
From: Sascha Hauer <[email protected]>
Date: Wed, 8 Apr 2009 11:41:49 +0200
Subject: mx3fb: Fix compilation with CONFIG_PM
--- drivers/video/mx3fb.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/video/mx3fb.c +7 -7
@@ -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 ;
Signature · 13 lines
1.6.2.1 -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com
Quoted 4 lines · Sascha Hauer
Hi Guennadi,
The following fixes mx3fb compilation with
CONFIG_PM
Quoted 8 lines
Sascha
Quoted 1 line
From
cb9f64e5c9bc108d6b6bcf78ae19df45107d766cMon Sep 17 00:00:00 2001From: Sascha Hauer <[email protected]>
Date: Wed, 8 Apr 2009 11:41:49 +0200
Subject: mx3fb: Fix compilation withCONFIG_PMSigned-off-by Sascha Hauer <[email protected]>
Quoted 53 lines
--- drivers/video/mx3fb.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)drivers/video/mx3fb.c +7
-7@@ -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 ;Signature · 7 lines
1.6.2.1 -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com