[PATCH] V4L: Link tuner before saa7134

[PATCH] V4L: Link tuner before saa7134

[Simon Arlott]

>From cde790c56ffe76f3d0bf6f38d89f4e671a5218c6 Mon Sep 17 00:00:00 2001
From: Simon Arlott <simon@redrum.invalid>
Date: Sun, 13 Jul 2008 19:24:53 +0100
Subject: [PATCH] V4L: Link tuner before saa7134

If saa7134_init is run before v4l2_i2c_drv_init (tuner),
then saa7134_board_init2 will try to set the tuner type
for devices that don't exist yet. This moves tuner to
before all of the device-specific drivers so that it's
loaded early enough on boot.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
 drivers/media/video/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ecbbfaa..6b0af12 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
   obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
 endif
 
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
@@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
-
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
-- 
1.5.6.2

-- 
Simon Arlott

Re: [PATCH] V4L: Link tuner before saa7134

[hermann pitton]

Am Sonntag, den 13.07.2008, 19:32 +0100 schrieb Simon Arlott:
> >From cde790c56ffe76f3d0bf6f38d89f4e671a5218c6 Mon Sep 17 00:00:00 2001
> From: Simon Arlott <simon@redrum.invalid>
> Date: Sun, 13 Jul 2008 19:24:53 +0100
> Subject: [PATCH] V4L: Link tuner before saa7134
> 
> If saa7134_init is run before v4l2_i2c_drv_init (tuner),
> then saa7134_board_init2 will try to set the tuner type
> for devices that don't exist yet. This moves tuner to
> before all of the device-specific drivers so that it's
> loaded early enough on boot.
> 
> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
> ---
>  drivers/media/video/Makefile |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
> index ecbbfaa..6b0af12 100644
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
>    obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
>  endif
>  
> +obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> +
>  obj-$(CONFIG_VIDEO_BT848) += bt8xx/
>  obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
>  obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
> @@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
>  obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
>  obj-$(CONFIG_TUNER_3036) += tuner-3036.o
>  
> -obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> -
>  obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
>  obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
>  obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
> -- 
> 1.5.6.2
> 

Thanks a lot for working on it!

I must admit that I have not tested it yet.

Remaining issues are.

#1 users can't set the tuner type anymore,
   but the few cases of tuner detection from eeprom we have should
   work again for that price.

#2 We still don't have any sufficient HDTV support in the kernel ;)

#0 On 2.6.25, without dedicated TV subnorm selection possible anymore
   and known auto detection flaws, fixed now, folks should have 
   complained about it.

   Interestingly nothing like that happened.
 
   What could that mean?

Cheers,
Hermann

Re: [PATCH] V4L: Link tuner before saa7134

[Simon Arlott]

On Mon, July 14, 2008 03:48, hermann pitton wrote:
>
> Am Sonntag, den 13.07.2008, 19:32 +0100 schrieb Simon Arlott:
>> >From cde790c56ffe76f3d0bf6f38d89f4e671a5218c6 Mon Sep 17 00:00:00 2001
>> From: Simon Arlott <simon@redrum.invalid>
>> Date: Sun, 13 Jul 2008 19:24:53 +0100
>> Subject: [PATCH] V4L: Link tuner before saa7134
>>
>> If saa7134_init is run before v4l2_i2c_drv_init (tuner),
>> then saa7134_board_init2 will try to set the tuner type
>> for devices that don't exist yet. This moves tuner to
>> before all of the device-specific drivers so that it's
>> loaded early enough on boot.
>>
>> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
>> ---
>>  drivers/media/video/Makefile |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
>> index ecbbfaa..6b0af12 100644
>> --- a/drivers/media/video/Makefile
>> +++ b/drivers/media/video/Makefile
>> @@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
>>    obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
>>  endif
>>
>> +obj-$(CONFIG_VIDEO_TUNER) += tuner.o
>> +
>>  obj-$(CONFIG_VIDEO_BT848) += bt8xx/
>>  obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
>>  obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
>> @@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
>>  obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
>>  obj-$(CONFIG_TUNER_3036) += tuner-3036.o
>>
>> -obj-$(CONFIG_VIDEO_TUNER) += tuner.o
>> -
>>  obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
>>  obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
>>  obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
>> --
>> 1.5.6.2
>>
>
> Thanks a lot for working on it!
>
> I must admit that I have not tested it yet.
>
> Remaining issues are.
>
> #1 users can't set the tuner type anymore,
>    but the few cases of tuner detection from eeprom we have should
>    work again for that price.
There are already module parameters to do that... they can be used
from the kernel command line too.

>
> #2 We still don't have any sufficient HDTV support in the kernel ;)
>
DVB-T2? Why is that relevant to this change? My card doesn't even support
it.

> #0 On 2.6.25, without dedicated TV subnorm selection possible anymore
>    and known auto detection flaws, fixed now, folks should have
>    complained about it.
>
>    Interestingly nothing like that happened.
>
>    What could that mean?
>
I'm not sure what you're asking, but not many people appear to compile
v4l/dvb into the kernel. Lots of function calls still work on
uninitialised modules so ordering problems can easily be missed.

> Cheers,
> Hermann

-- 
Simon Arlott

Re: [PATCH] V4L: Link tuner before saa7134

[hermann pitton]

Am Montag, den 14.07.2008, 12:40 +0100 schrieb Simon Arlott:
> On Mon, July 14, 2008 03:48, hermann pitton wrote:
> >
> > Am Sonntag, den 13.07.2008, 19:32 +0100 schrieb Simon Arlott:
> >> >From cde790c56ffe76f3d0bf6f38d89f4e671a5218c6 Mon Sep 17 00:00:00 2001
> >> From: Simon Arlott <simon@redrum.invalid>
> >> Date: Sun, 13 Jul 2008 19:24:53 +0100
> >> Subject: [PATCH] V4L: Link tuner before saa7134
> >>
> >> If saa7134_init is run before v4l2_i2c_drv_init (tuner),
> >> then saa7134_board_init2 will try to set the tuner type
> >> for devices that don't exist yet. This moves tuner to
> >> before all of the device-specific drivers so that it's
> >> loaded early enough on boot.
> >>
> >> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
> >> ---
> >>  drivers/media/video/Makefile |    4 ++--
> >>  1 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
> >> index ecbbfaa..6b0af12 100644
> >> --- a/drivers/media/video/Makefile
> >> +++ b/drivers/media/video/Makefile
> >> @@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
> >>    obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
> >>  endif
> >>
> >> +obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> >> +
> >>  obj-$(CONFIG_VIDEO_BT848) += bt8xx/
> >>  obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
> >>  obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
> >> @@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
> >>  obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
> >>  obj-$(CONFIG_TUNER_3036) += tuner-3036.o
> >>
> >> -obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> >> -
> >>  obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
> >>  obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
> >>  obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
> >> --
> >> 1.5.6.2
> >>
> >
> > Thanks a lot for working on it!
> >
> > I must admit that I have not tested it yet.
> >
> > Remaining issues are.
> >
> > #1 users can't set the tuner type anymore,
> >    but the few cases of tuner detection from eeprom we have should
> >    work again for that price.
> There are already module parameters to do that... they can be used
> from the kernel command line too.

They are broken for what I do say during the last three months and a
build just now tells the same.

> >
> > #2 We still don't have any sufficient HDTV support in the kernel ;)
> >
> DVB-T2? Why is that relevant to this change? My card doesn't even support
> it.

Sorry for abusing the thread a little, I plan some vacations and try to
dump what I have left in mind.

Your card should at least support Australian DVB-T HDTV.

We have some new support for DVB-S in 2.6.26, mostly triple or quad
capable cards, using the dual isl6405 as LNB supply. I would love to see
more feedback here for HDTV usage. (not S2, but for example BBC HD
1080i, works flawlessly somewhere else ...)

> > #0 On 2.6.25, without dedicated TV subnorm selection possible anymore
> >    and known auto detection flaws, fixed now, folks should have
> >    complained about it.
> >
> >    Interestingly nothing like that happened.
> >
> >    What could that mean?
> >
> I'm not sure what you're asking, but not many people appear to compile
> v4l/dvb into the kernel. Lots of function calls still work on
> uninitialised modules so ordering problems can easily be missed.
> 

We have much less testers than previously I believe.

The tda827x still seems not to compile, if tuner customization is not
selected. Likely the isl6405 under frontend customization needs to be
checked too.

Thanks again.

Cheers,
Hermann

[PATCH] V4L: Link tuner before saa7134

[Simon Arlott]

If saa7134_init is run before v4l2_i2c_drv_init (tuner),
then saa7134_board_init2 will try to set the tuner type
for devices that don't exist yet. This moves tuner to
before all of the device-specific drivers so that it's
loaded early enough on boot.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
Resend... I accidentally left the git-send-email headers in.

Mailman appears to be easily confused too: 
http://www.linuxtv.org/pipermail/linux-dvb/2008-July/027205.html

 drivers/media/video/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ecbbfaa..6b0af12 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
   obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
 endif
 
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
@@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
-
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
-- 
1.5.6.2

-- 
Simon Arlott

Re: [PATCH] V4L: Link tuner before saa7134

[hermann pitton]

Hi Simon,

Am Dienstag, den 15.07.2008, 22:40 +0100 schrieb Simon Arlott:
> If saa7134_init is run before v4l2_i2c_drv_init (tuner),
> then saa7134_board_init2 will try to set the tuner type
> for devices that don't exist yet. This moves tuner to
> before all of the device-specific drivers so that it's
> loaded early enough on boot.
> 
> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
> ---
> Resend... I accidentally left the git-send-email headers in.
> 
> Mailman appears to be easily confused too: 
> http://www.linuxtv.org/pipermail/linux-dvb/2008-July/027205.html

the saa713x maintainer after Gerd is actually Hartmut.

He might not have always the time for it immediately, but should have a
copy of what is going on.

Actually, these problems are within the build system and should not even
come down to a driver maintainer.

The crowd here is used to have some trouble concerning the build, best
was when guys like Trent did watch out for it before we had some impact.

Cheers,
Hermann

>  drivers/media/video/Makefile |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
> index ecbbfaa..6b0af12 100644
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@ -18,6 +18,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
>    obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
>  endif
>  
> +obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> +
>  obj-$(CONFIG_VIDEO_BT848) += bt8xx/
>  obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
>  obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
> @@ -84,8 +86,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
>  obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
>  obj-$(CONFIG_TUNER_3036) += tuner-3036.o
>  
> -obj-$(CONFIG_VIDEO_TUNER) += tuner.o
> -
>  obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
>  obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
>  obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
> -- 
> 1.5.6.2
> 

Re: [PATCH] V4L: Link tuner before saa7134

[Brian Marete]

On Jul 14, 6:00 am, hermann pitton <hermann-pit...@arcor.de> wrote:
>
> #1 users can't set thetunertype anymore,
>    but the few cases oftunerdetection from eeprom we have should
>    work again for that price.

Hello,

Any patch yet for above issue? It seems to have made it into 2.6.26.

I use saa7134 with everything, including the tuner modules, compiled
as a module. My card is detected as a flyvideo2000. The default tuner
for that card (#37) allows me to tune into TV but not to FM Radio. I
can access both functions (TV and FM Radio) if I override with
tuner=69, which is what I usually do. That override does not work on
2.6.26.

Any suggestions?

Thanks,

-- 
B. Gitonga Marete
Tel: +254-722-151-590

Re: [PATCH] V4L: Link tuner before saa7134

[Simon Arlott]

On Fri, July 18, 2008 12:28, Brian Marete wrote:
> On Jul 14, 6:00 am, hermann pitton <hermann-pit...@arcor.de> wrote:
>>
>> #1 users can't set thetunertype anymore,
>>    but the few cases oftunerdetection from eeprom we have should
>>    work again for that price.
>
> Hello,
>
> Any patch yet for above issue? It seems to have made it into 2.6.26.
>
> I use saa7134 with everything, including the tuner modules, compiled
> as a module. My card is detected as a flyvideo2000. The default tuner
> for that card (#37) allows me to tune into TV but not to FM Radio. I
> can access both functions (TV and FM Radio) if I override with
> tuner=69, which is what I usually do. That override does not work on
> 2.6.26.
>
> Any suggestions?

Modify saa7134_board_init2 so that the manual tuner type setting isn't
ignored. The first thing it does is to overwrite the current value
(set earlier from module parameter) with the static values... even
before trying to autodetect it.

In saa7134-core.c saa7134_initdev:
 dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
+dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;

In saa7134-cards.c saa7134_board_init2:
-dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
-dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;

I think that will fix it.

>
> Thanks,
>
> --
> B. Gitonga Marete
> Tel: +254-722-151-590
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>


-- 
Simon Arlott

Re: [linux-dvb] [PATCH] V4L: Link tuner before saa7134

[hermann pitton]

Hi,

Am Freitag, den 18.07.2008, 12:51 +0100 schrieb Simon Arlott:
> On Fri, July 18, 2008 12:28, Brian Marete wrote:
> > On Jul 14, 6:00 am, hermann pitton <hermann-pit...@arcor.de> wrote:
> >>
> >> #1 users can't set thetunertype anymore,
> >>    but the few cases oftunerdetection from eeprom we have should
> >>    work again for that price.
> >
> > Hello,
> >
> > Any patch yet for above issue? It seems to have made it into 2.6.26.
> >
> > I use saa7134 with everything, including the tuner modules, compiled
> > as a module. My card is detected as a flyvideo2000. The default tuner
> > for that card (#37) allows me to tune into TV but not to FM Radio. I
> > can access both functions (TV and FM Radio) if I override with
> > tuner=69, which is what I usually do. That override does not work on
> > 2.6.26.
> >
> > Any suggestions?
> 
> Modify saa7134_board_init2 so that the manual tuner type setting isn't
> ignored. The first thing it does is to overwrite the current value
> (set earlier from module parameter) with the static values... even
> before trying to autodetect it.
> 
> In saa7134-core.c saa7134_initdev:
>  dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
> +dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;
> 
> In saa7134-cards.c saa7134_board_init2:
> -dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
> -dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;
> 
> I think that will fix it.
> 

this restores tuner behavior on the saa7134 driver.

I can't test XCeive tuners, which load different firmware dynamically.
Mauro was on them.

Please send the patch to Mauro and/or provide your signed-off-by.

This must go to the stable team ASAP as well.

Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>

Many thanks!

Cheers,
Hermann

[PATCH] saa7134: Copy tuner data earlier in init to avoid overwriting manual tuner type

[Simon Arlott]

When saa7134_board_init2 runs, it immediately overwrites the current value
(set earlier from module parameter) of tuner_type with the static values,
and then does autodetection. This patch moves the tuner_addr copy to earlier
in saa7134_initdev and removes the tuner_type copy from saa7134_board_init2.

Autodetection could still potentially change to the wrong tuner type, but it
is now possible to override the default type for the card again.

My card's tuner is configured with autodetection from eeprom, so I don't 
need to manually set the tuner. I've checked that the autodetection still 
works for my card.

Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>
Cc: Brian Marete <bgmarete@gmail.com>
Tested-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
> this restores tuner behavior on the saa7134 driver.
> 
> I can't test XCeive tuners, which load different firmware dynamically.
> Mauro was on them.
> 
> Please send the patch to Mauro and/or provide your signed-off-by.
> 
> This must go to the stable team ASAP as well.
> 
> Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>

drivers/media/video/saa7134/saa7134-cards.c |    3 ---
drivers/media/video/saa7134/saa7134-core.c  |    5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 2618cfa..0227cf9 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5703,9 +5703,6 @@ int saa7134_board_init2(struct saa7134_dev *dev)
	unsigned char buf;
	int board;

-	dev->tuner_type = saa7134_boards[dev->board].tuner_type;
-	dev->tuner_addr = saa7134_boards[dev->board].tuner_addr;
-
	switch (dev->board) {
	case SAA7134_BOARD_BMK_MPEX_NOTUNER:
	case SAA7134_BOARD_BMK_MPEX_TUNER:
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 2c19cd0..69f340d 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -946,11 +946,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
		dev->board = SAA7134_BOARD_UNKNOWN;
	}
	dev->autodetected = card[dev->nr] != dev->board;
-	dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
+	dev->tuner_type = saa7134_boards[dev->board].tuner_type;
+	dev->tuner_addr = saa7134_boards[dev->board].tuner_addr;
	dev->tda9887_conf = saa7134_boards[dev->board].tda9887_conf;
	if (UNSET != tuner[dev->nr])
		dev->tuner_type = tuner[dev->nr];
-		printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+	printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
		dev->name,pci_dev->subsystem_vendor,
		pci_dev->subsystem_device,saa7134_boards[dev->board].name,
		dev->board, dev->autodetected ?
-- 
1.5.6.2

-- 
Simon Arlott

Re: [PATCH] V4L: Link tuner before saa7134

[Brian Marete]

On Fri, Jul 18, 2008 at 2:51 PM, Simon Arlott <simon@fire.lp0.eu> wrote:
>
> On Fri, July 18, 2008 12:28, Brian Marete wrote:
>> On Jul 14, 6:00 am, hermann pitton <hermann-pit...@arcor.de> wrote:
>>>
>>> #1 users can't set thetunertype anymore,
>>>    but the few cases oftunerdetection from eeprom we have should
>>>    work again for that price.
>>
>> Hello,
>>
>> Any patch yet for above issue? It seems to have made it into 2.6.26.
>>
>> I use saa7134 with everything, including the tuner modules, compiled
>> as a module. My card is detected as a flyvideo2000. The default tuner
>> for that card (#37) allows me to tune into TV but not to FM Radio. I
>> can access both functions (TV and FM Radio) if I override with
>> tuner=69, which is what I usually do. That override does not work on
>> 2.6.26.
>>
>> Any suggestions?
>
> Modify saa7134_board_init2 so that the manual tuner type setting isn't
> ignored. The first thing it does is to overwrite the current value
> (set earlier from module parameter) with the static values... even
> before trying to autodetect it.
>
> In saa7134-core.c saa7134_initdev:
>  dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
> +dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;
>
> In saa7134-cards.c saa7134_board_init2:
> -dev->tuner_type   = saa7134_boards[dev->board].tuner_type;
> -dev->tuner_addr   = saa7134_boards[dev->board].tuner_addr;
>
> I think that will fix it.

And, indeed, it fixed it. I hope the patch will make it into the main-line.

Thanks.

-- 
B. Gitonga Marete
Tel: +254-722-151-590