omapfb: fix argument of blank operation
The blank operation should receive FB_BLANK_POWERDOWN, not VESA_POWERDOWN. Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Andrea Righi <righi.andrea@gmail.com> Acked-by: Trilok Soni <soni.trilok@gmail.com> Cc: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
23b7365454
commit
c958557eb6
|
@ -338,7 +338,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
|
||||||
|
|
||||||
omapfb_rqueue_lock(fbdev);
|
omapfb_rqueue_lock(fbdev);
|
||||||
switch (blank) {
|
switch (blank) {
|
||||||
case VESA_NO_BLANKING:
|
case FB_BLANK_UNBLANK:
|
||||||
if (fbdev->state == OMAPFB_SUSPENDED) {
|
if (fbdev->state == OMAPFB_SUSPENDED) {
|
||||||
if (fbdev->ctrl->resume)
|
if (fbdev->ctrl->resume)
|
||||||
fbdev->ctrl->resume();
|
fbdev->ctrl->resume();
|
||||||
|
@ -349,7 +349,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
|
||||||
do_update = 1;
|
do_update = 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case VESA_POWERDOWN:
|
case FB_BLANK_POWERDOWN:
|
||||||
if (fbdev->state == OMAPFB_ACTIVE) {
|
if (fbdev->state == OMAPFB_ACTIVE) {
|
||||||
fbdev->panel->disable(fbdev->panel);
|
fbdev->panel->disable(fbdev->panel);
|
||||||
if (fbdev->ctrl->suspend)
|
if (fbdev->ctrl->suspend)
|
||||||
|
@ -1818,7 +1818,7 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
omapfb_blank(VESA_POWERDOWN, fbdev->fb_info[0]);
|
omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1828,7 +1828,7 @@ static int omapfb_resume(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info[0]);
|
omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue