diff options
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 6 |
2 files changed, 7 insertions, 3 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; |