30 lines
954 B
Diff
30 lines
954 B
Diff
From bda19b9359d9dc60f8b0beb5685e173e236ee30f Mon Sep 17 00:00:00 2001
|
|
From: Hardik Shah <hardik.shah@ti.com>
|
|
Date: Wed, 15 Apr 2009 17:05:18 +0530
|
|
Subject: [PATCH] DSS2: dispc_get_trans_key was returning wrong key type
|
|
|
|
Signed-off-by: Hardik Shah <hardik.shah@ti.com>
|
|
---
|
|
drivers/video/omap2/dss/dispc.c | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
|
|
index 23a8155..076d3d4 100644
|
|
--- a/drivers/video/omap2/dss/dispc.c
|
|
+++ b/drivers/video/omap2/dss/dispc.c
|
|
@@ -1826,9 +1826,9 @@ void dispc_get_trans_key(enum omap_channel ch,
|
|
enable_clocks(1);
|
|
if (type) {
|
|
if (ch == OMAP_DSS_CHANNEL_LCD)
|
|
- *type = REG_GET(DISPC_CONFIG, 11, 11) >> 11;
|
|
+ *type = REG_GET(DISPC_CONFIG, 11, 11);
|
|
else if (ch == OMAP_DSS_CHANNEL_DIGIT)
|
|
- *type = REG_GET(DISPC_CONFIG, 13, 13) >> 13;
|
|
+ *type = REG_GET(DISPC_CONFIG, 13, 13);
|
|
else
|
|
BUG();
|
|
}
|
|
--
|
|
1.5.6.5
|
|
|