[patch] msp3400 quick fix

[patch] msp3400 quick fix

[Gerd Knorr]

The new "simpler" opmode added by the recent merge from ivtv breaks
msp3400 support for other tv cards.  Not figured yet why.

This patch disables the "simpler" mode by default (can still be enabled
by insmod option) as quick fix for 2.6.10.

Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
---
 drivers/media/video/msp3400.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -u linux-2.6.10/drivers/media/video/msp3400.c linux/drivers/media/video/msp3400.c
--- linux-2.6.10/drivers/media/video/msp3400.c	2004-12-07 14:16:53.000000000 +0100
+++ linux/drivers/media/video/msp3400.c	2004-12-07 15:57:22.268877333 +0100
@@ -1503,9 +1503,12 @@
 
 	msp->opmode = opmode;
 	if (OPMODE_AUTO == msp->opmode) {
+#if 0 /* seems to work for ivtv only, disable by default for now ... */
 		if (HAVE_SIMPLER(msp))
 			msp->opmode = OPMODE_SIMPLER;
-		else if (HAVE_SIMPLE(msp))
+		else
+#endif
+		if (HAVE_SIMPLE(msp))
 			msp->opmode = OPMODE_SIMPLE;
 		else
 			msp->opmode = OPMODE_MANUAL;

-- 
#define printk(args...) fprintf(stderr, ## args)