diff options
| author | Richard Purdie <richard@ted.(none)> | 2009-04-28 17:13:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard@ted.(none)> | 2009-04-28 17:13:57 +0100 |
| commit | 6a6f5cc8206f35dba044f59ae59ed878c2f8fb94 (patch) | |
| tree | d325b4fe4696551589573a1b43c19e82cc0cd0d1 /meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch | |
| parent | a8e1e028f85b4d6f37238b9cbb0bab19b5939b29 (diff) | |
| parent | 0adc74b06210f1be01145a5977a36b83aca0aa68 (diff) | |
| download | openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.gz openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.bz2 openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.xz openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.zip | |
Merge branch 'marcin/trunk' of git://git.pokylinux.org/poky-contrib
Diffstat (limited to 'meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch')
| -rw-r--r-- | meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch b/meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch new file mode 100644 index 000000000..7e2bb4893 --- /dev/null +++ b/meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch @@ -0,0 +1,29 @@ +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 + |