summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-10-29 13:26:04 +0800
committerAlex Shi <alex.shi@linaro.org>2016-10-29 13:26:04 +0800
commitc11a255c622e7a2d312f4080c6ef529dd67b3c38 (patch)
treec7d36f8014e9da35e4b772cfdc1779ec0449d657 /drivers/video
parent273daee0be36235886622396eedb618fc5de0213 (diff)
parent25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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) |