summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch
new file mode 100644
index 0000000000..362368a6cf
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch
@@ -0,0 +1,34 @@
1Index: linux-2.6.24/drivers/video/omap/omap_disp_out.c
2===================================================================
3--- linux-2.6.24.orig/drivers/video/omap/omap_disp_out.c 2008-10-08 10:53:04.000000000 +0100
4+++ linux-2.6.24/drivers/video/omap/omap_disp_out.c 2008-10-08 10:53:57.000000000 +0100
5@@ -1020,6 +1020,7 @@
6 else
7 return -EINVAL;
8
9+#ifdef CONFIG_OMAP2_TV
10 if (out_dev == OMAP2_OUTPUT_TV) {
11 if (tv_in_use == 0) {
12 h4_i2c_tvout_on(NULL);
13@@ -1027,6 +1028,7 @@
14 tv_in_use = 1;
15 }
16 }
17+#endif
18
19 if(omap2_disp_get_output_dev(layer) == out_dev)
20 return count;
21@@ -1050,11 +1052,13 @@
22 (omap2_disp_get_output_dev(OMAP2_VIDEO1) == OMAP2_OUTPUT_LCD) &&
23 (omap2_disp_get_output_dev(OMAP2_VIDEO2) == OMAP2_OUTPUT_LCD))
24 {
25+#ifdef CONFIG_OMAP2_TV
26 if (tv_in_use != 0) {
27 omap2_disp_disable_output_dev(OMAP2_OUTPUT_TV);
28 h4_i2c_tvout_off(NULL);
29 tv_in_use = 0;
30 }
31+#endif
32 }
33
34 return count;