diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
| commit | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (patch) | |
| tree | bfe0a664f88b6cb9d284869d615ae2d7fdb7cf63 /drivers/video | |
| parent | 77501f3cb648e18733509a951ed31eddd7ef2c0b (diff) | |
| parent | 452503f993feffe96e8cc9fbff4888b96e2c5e40 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/logo/.gitignore | 7 | ||||
| -rw-r--r-- | drivers/video/vesafb.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/video/logo/.gitignore b/drivers/video/logo/.gitignore new file mode 100644 index 00000000000..e48355f538f --- /dev/null +++ b/drivers/video/logo/.gitignore @@ -0,0 +1,7 @@ +# +# Generated files +# +*_mono.c +*_vga16.c +*_clut224.c +*_gray256.c diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 1ca80264c7b..b1243da55fc 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -96,14 +96,14 @@ static int vesafb_blank(int blank, struct fb_info *info) int loop = 10000; u8 seq = 0, crtc17 = 0; - err = 0; - - if (blank) { + if (blank == FB_BLANK_POWERDOWN) { seq = 0x20; crtc17 = 0x00; + err = 0; } else { seq = 0x00; crtc17 = 0x80; + err = (blank == FB_BLANK_UNBLANK) ? 0 : -EINVAL; } vga_wseq(NULL, 0x00, 0x01); |