[PATCH] ngene: fix commit 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186

[PATCH] ngene: fix commit 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186

[Mauro Carvalho Chehab]

The above commit were applied only partially; it broke tuner and
demod attach, but the part that added it to ngene_info was missing.

Not sure what happened there, but, without this patch, a regression
would be happening.

Also, gcc complains about a defined but not used symbol.

So, apply manually the missing part.

Cc: Patrice Chotard <patricechotard@free.fr>
Cc: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 drivers/media/pci/ngene/ngene-cards.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index 2a4895b..82318d1 100644
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -732,6 +732,7 @@ static struct ngene_info ngene_info_terratec = {
 	.name           = "Terratec Integra/Cinergy2400i Dual DVB-T",
 	.io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
 	.demod_attach   = {demod_attach_drxd, demod_attach_drxd},
+	.tuner_attach	= {tuner_attach_dtt7520x, tuner_attach_dtt7520x},
 	.fe_config      = {&fe_terratec_dvbt_0, &fe_terratec_dvbt_1},
 	.i2c_access     = 1,
 };
-- 
1.7.11.7

Re: [PATCH] ngene: fix commit 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186

[Patrice Chotard]

Hi Mauro,

Yes, i confirm that without this patch, tuner_attach_dtt7520x() callback
was never called, so no tuning was possible.

Patrice

Le 05/01/2013 05:06, Mauro Carvalho Chehab a écrit :
> The above commit were applied only partially; it broke tuner and
> demod attach, but the part that added it to ngene_info was missing.
> 
> Not sure what happened there, but, without this patch, a regression
> would be happening.
> 
> Also, gcc complains about a defined but not used symbol.
> 
> So, apply manually the missing part.
> 
> Cc: Patrice Chotard <patricechotard@free.fr>
> Cc: Antti Palosaari <crope@iki.fi>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> ---
>  drivers/media/pci/ngene/ngene-cards.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
> index 2a4895b..82318d1 100644
> --- a/drivers/media/pci/ngene/ngene-cards.c
> +++ b/drivers/media/pci/ngene/ngene-cards.c
> @@ -732,6 +732,7 @@ static struct ngene_info ngene_info_terratec = {
>  	.name           = "Terratec Integra/Cinergy2400i Dual DVB-T",
>  	.io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
>  	.demod_attach   = {demod_attach_drxd, demod_attach_drxd},
> +	.tuner_attach	= {tuner_attach_dtt7520x, tuner_attach_dtt7520x},
>  	.fe_config      = {&fe_terratec_dvbt_0, &fe_terratec_dvbt_1},
>  	.i2c_access     = 1,
>  };
> 

Re: [PATCH] ngene: fix commit 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186

[Mauro Carvalho Chehab]

Em Sat, 05 Jan 2013 10:39:21 +0100
Patrice Chotard <patrice.chotard@sfr.fr> escreveu:

> Hi Mauro,
> 
> Yes, i confirm that without this patch, tuner_attach_dtt7520x() callback
> was never called, so no tuning was possible.

Thanks for double-checking. Not sure why the original patch got truncated.
Maybe due to some bad conflict solving, or maybe patchwork mangled the
original patch. That sometimes happen when one hunk description has more
than 80-cols and the email got word-wrapped.

Regards,
Mauro