diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 47 |
3 files changed, 26 insertions, 31 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 12a933084..f427ae2d9 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.90 2005/08/30 15:01:48 mchehab Exp $ + * $Id: cx88-video.c,v 1.91 2005/08/30 15:18:50 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2326,7 +2326,7 @@ static int cx8800_resume(struct pci_dev *pci_dev) pci_disable_device(pci_dev); dev->state.disabled = 1; - + return err; } #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index b7dbdb1e5..fc1c2b275 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.48 2005/08/30 05:20:08 mkrufky Exp $ + * $Id: tuner-simple.c,v 1.49 2005/08/30 15:18:50 mkrufky Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -486,6 +486,10 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) case TUNER_LG_PAL_FM: buffer[3] = 0xa5; break; + case TUNER_MICROTUNE_4049FM5: + div = (20 * freq) / 16000 + (int)(33.3 * 20); /* IF 33.3 MHz */ + buffer[3] = 0xa4; + break; default: buffer[3] = 0xa4; break; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 244eebb99..37dc804da 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,27 +1,18 @@ -2005-08-30 14:58 +2005-08-30 15:11 mkrufky - * bttv-driver.c,cx88-mpeg.c,cx88-video.c: - - Some error treatment implemented at resume functions. - - Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> - -2005-08-30 14:56 - - * Makefile: - * bttv-driver.c: - * cx88-mpeg.c: (cx8802_resume_common): * cx88-video.c: (cx8800_resume): - * scripts/prepare-ChangeLog.pl: + - removed trailing whitespace. - Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + * tuner-simple.c: (default_set_radio_freq): + - The Microtune 4049FM5 uses an IF frequency of 33.3 MHz for FM radio. -2005-08-30 14:54 + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> - * Makefile: - * bttv-driver.c: - * cx88-mpeg.c: (cx8802_resume_common): - * cx88-video.c: (cx8800_resume): - * scripts/prepare-ChangeLog.pl: +2005-08-30 14:58 mchehab + + * bttv-driver.c, cx88-mpeg.c, cx88-video.c: + - Some error treatment implemented at resume functions. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> @@ -32,23 +23,23 @@ Signed-off-by: Michael Krufky <mkrufky@m1k.net> -2005-08-30 05:09 +2005-08-30 05:09 mchehab - * bttv-cards.c,cx88-cards.c,tveeprom.h: + * bttv-cards.c, cx88-cards.c, tveeprom.h: - tveeprom patch was not complete. Completing it. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> -2005-08-30 04:44 +2005-08-30 04:44 mchehab * tuner-simple.c, tuner.h: - - normalize whitespace and comments in tuner lists + - normalize whitespace and comments in tuner lists. Signed-off-by: Philip Rowlands <phr@doc.ic.ac.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> -2005-08-30 04:31 +2005-08-30 04:31 mchehab * tveeprom.c: - tveeprom_hauppauge_analog has an extra i2c_client * argument. @@ -71,7 +62,7 @@ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> -2005-08-30 04:21 +2005-08-30 04:21 mchehab * tvaudio.c: - adds the adapter number + i2c address to printk msgs. @@ -135,7 +126,7 @@ Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Michael Krufky <mkrufky@m1k.net> -2005-08-20 22:08 +2005-08-20 22:08 mchehab * tuner-simple.c: - correct LG NTSC TALN mini tuner takeover as far we can @@ -144,7 +135,7 @@ Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> -2005-08-20 17:37 +2005-08-20 17:37 mchehab * tveeprom.c: (tveeprom_command): - This syncs the tuners list with the list from ivtv. @@ -153,7 +144,7 @@ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> -2005-08-20 17:30 +2005-08-20 17:30 mchehab * msp3400.c: (msp_attach): - Changes the prefix to 'msp34xx' instead of 'msp3400'. |