summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-12-20 17:04:49 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-11 15:56:37 +0100
commitcd2eb96658b73d3110071c848029767c3f43c0da (patch)
treef1146834fabd0edeac26dec1ac5d7565a2733e7b /drivers/video
parent56ffbfa0a24d8fd51ce9a7f79e36150a75b68c2a (diff)
parenta34f0e8a2f8976f0bae4962edf2af4dd16cb85f7 (diff)
Merge tag 'v4.4.39' into toradex_vf_4.4-next
This is the 4.4.39 stable release
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/efifb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 95d293b7445a..dc2fcda54d53 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -52,9 +52,9 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
return 1;
if (regno < 16) {
- red >>= 8;
- green >>= 8;
- blue >>= 8;
+ red >>= 16 - info->var.red.length;
+ green >>= 16 - info->var.green.length;
+ blue >>= 16 - info->var.blue.length;
((u32 *)(info->pseudo_palette))[regno] =
(red << info->var.red.offset) |
(green << info->var.green.offset) |