diff options
author | Felipe Contreras <felipe.contreras@nokia.com> | 2009-03-31 18:25:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:33 -0400 |
commit | c958557eb6e5f0fa15aeda3b6f952051b4179394 (patch) | |
tree | 1d941c1dc3cd3bbd90dbb9acb7bd0bd78d8ede7f | |
parent | 23b736545473ed853b685cbc03883aa6ff3f0e0d (diff) |
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>
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 1a49519dafa4..060d72fe57cb 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -338,7 +338,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi) | |||
338 | 338 | ||
339 | omapfb_rqueue_lock(fbdev); | 339 | omapfb_rqueue_lock(fbdev); |
340 | switch (blank) { | 340 | switch (blank) { |
341 | case VESA_NO_BLANKING: | 341 | case FB_BLANK_UNBLANK: |
342 | if (fbdev->state == OMAPFB_SUSPENDED) { | 342 | if (fbdev->state == OMAPFB_SUSPENDED) { |
343 | if (fbdev->ctrl->resume) | 343 | if (fbdev->ctrl->resume) |
344 | fbdev->ctrl->resume(); | 344 | fbdev->ctrl->resume(); |
@@ -349,7 +349,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi) | |||
349 | do_update = 1; | 349 | do_update = 1; |
350 | } | 350 | } |
351 | break; | 351 | break; |
352 | case VESA_POWERDOWN: | 352 | case FB_BLANK_POWERDOWN: |
353 | if (fbdev->state == OMAPFB_ACTIVE) { | 353 | if (fbdev->state == OMAPFB_ACTIVE) { |
354 | fbdev->panel->disable(fbdev->panel); | 354 | fbdev->panel->disable(fbdev->panel); |
355 | if (fbdev->ctrl->suspend) | 355 | if (fbdev->ctrl->suspend) |
@@ -1818,7 +1818,7 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg) | |||
1818 | { | 1818 | { |
1819 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); | 1819 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); |
1820 | 1820 | ||
1821 | omapfb_blank(VESA_POWERDOWN, fbdev->fb_info[0]); | 1821 | omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]); |
1822 | 1822 | ||
1823 | return 0; | 1823 | return 0; |
1824 | } | 1824 | } |
@@ -1828,7 +1828,7 @@ static int omapfb_resume(struct platform_device *pdev) | |||
1828 | { | 1828 | { |
1829 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); | 1829 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); |
1830 | 1830 | ||
1831 | omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info[0]); | 1831 | omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]); |
1832 | return 0; | 1832 | return 0; |
1833 | } | 1833 | } |
1834 | 1834 | ||