Re: [PATCH -rc2-mm2] BUG FIX - v4l broken hybrid dvb inclusion

Michael Krufky
2005-07-12T17:20:05Z

Alexey Dobriyan wrote:

>On Tuesday 12 July 2005 19:06, Michael Krufky wrote:
>
>
>>v4l-saa7134-hybrid-dvb.patch
>>v4l-cx88-update.patch
>>
>>The specific change that caused this problem is:
>>
>>- Let Kconfig decide whether to include frontend-specific code.
>>
>>I had tested this change against 2.6.13-rc2-mm1, and it worked perfectly as
>>expected, but it caused problems in today's 2.6.13-rc2-mm2 release. For
>>some reason, the symbols don't get set properly.
>>
>>
>What symbols? What error messages do you see?
>
Alexey-

Maybe symbols was the wrong terminology... What I meant was the
CONFIG_DVB_LGDT3302 , etc flags

Previous patch removed the #define's that you see below... This should
have worked, since these should be set instead from kconfig, but it
didn't work as expected (even though the modules ARE selected by
kconfig), and the #ifdef's return false.... (I don't know why it worked
in my test against 2.6.13-rc2-mm1, but it doesn't work in -mm2, and it
must be fixed) Breaks all hybrid v4l/dvb boards.

>>--- linux-2.6.13-rc2-mm2.orig/drivers/media/video/cx88/cx88-dvb.c
>>+++ linux/drivers/media/video/cx88/cx88-dvb.c
>>
>>
>>+#define CONFIG_DVB_MT352 1
>>+#define CONFIG_DVB_CX22702 1
>>+#define CONFIG_DVB_OR51132 1
>>+#define CONFIG_DVB_LGDT3302 1
>>
>>
>>--- linux-2.6.13-rc2-mm2.orig/drivers/media/video/saa7134/saa7134-dvb.c
>>+++ linux/drivers/media/video/saa7134/saa7134-dvb.c
>>
>>
>>+#define CONFIG_DVB_MT352 1
>>+#define CONFIG_DVB_TDA1004X 1
>>
>>
>
>Looks band-aidly.
>
>
Yes, it does LOOK like a band-aid, but this is actually only reverting a
previous change. I admit that something better needs to be done. Gerd
Korr says to remove the #ifdef's alltogether. Instead, I just returned
the #define's ..... We can remove the #ifdef's in a future patch, but I
want to discuss this with the other v4l developers before I would make a
change like that. THIS patch, however, is safe to apply, and I've
already committed it into video4linux cvs.

Andrew, please apply this and don't merge the
[v4l-saa7134-hybrid-dvb.patch & v4l-cx88-update.patch] patches to Linus'
tree without this patch as well.

Thank you.

--
Michael Krufky