2005-02-04 13:05:32

by Gerd Knorr

Subject: [patch] tv-card tuner fixup

Hi,

That one should go into 2.6.11.

- fix initialization order bug.
- disable + comment current secam tweak, will not work that way ...

Signed-off-by: Gerd Knorr <[email protected]>
---
drivers/media/video/tda9887.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)

diff -u linux-2.6.11/drivers/media/video/tda9887.c linux/drivers/media/video/tda9887.c
--- linux-2.6.11/drivers/media/video/tda9887.c 2005-02-04 11:26:26.000000000 +0100
+++ linux/drivers/media/video/tda9887.c 2005-02-04 12:43:57.615444344 +0100
@@ -305,9 +305,9 @@
printk(" B5 force mute audio: %s\n",
(buf[1] & 0x20) ? "yes" : "no");
printk(" B6 output port 1 : %s\n",
- (buf[1] & 0x40) ? "high" : "low");
+ (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
printk(" B7 output port 2 : %s\n",
- (buf[1] & 0x80) ? "high" : "low");
+ (buf[1] & 0x80) ? "high (inactive)" : "low (active)");

printk(PREFIX "write: byte C 0x%02x\n",buf[2]);
printk(" C0-4 top adjustment : %s dB\n", adjust[buf[2] & 0x1f]);
@@ -545,19 +545,24 @@
int rc;

memset(buf,0,sizeof(buf));
+ tda9887_set_tvnorm(t,buf);
buf[1] |= cOutputPort1Inactive;
buf[1] |= cOutputPort2Inactive;
- tda9887_set_tvnorm(t,buf);
if (UNSET != t->pinnacle_id) {
tda9887_set_pinnacle(t,buf);
}
tda9887_set_config(t,buf);
tda9887_set_insmod(t,buf);

+#if 0
+ /* This as-is breaks some cards, must be fixed in a
+ * card-specific way, probably using TDA9887_SET_CONFIG to
+ * turn on/off port2 */
if (t->std & V4L2_STD_SECAM_L) {
/* secam fixup (FIXME: move this to tvnorms array?) */
buf[1] &= ~cOutputPort2Inactive;
}
+#endif

dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
buf[1],buf[2],buf[3]);

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

2005-02-04 15:56:57

by Linus Torvalds

Subject: Re: [patch] tv-card tuner fixup

On Fri, 4 Feb 2005, Gerd Knorr wrote:
>
> That one should go into 2.6.11.
>
> - fix initialization order bug.

I applied your earlier patch already. Can you verify that I merged
everything correctly, and that my current BK tree matches yours?

Linus

2005-02-08 09:42:43

by Gerd Knorr

Subject: Re: [patch] tv-card tuner fixup

> > That one should go into 2.6.11.
> > - fix initialization order bug.
>
> I applied your earlier patch already. Can you verify that I merged
> everything correctly, and that my current BK tree matches yours?

Yep, it is fine. Just a whitespace sneaked in somehow, otherwise
current bk is identical to my sources ;)

Gerd

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