diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 3f81aac46..8fed24e6a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.33 2005/06/20 22:06:52 mkrufky Exp $ + * $Id: saa7134-core.c,v 1.34 2005/06/28 23:41:47 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -999,7 +999,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, struct i2c_msg msg[] = {{.addr=0x50, .flags=0, .buf=&subaddr, .len = 1}, {.addr=0x50, .flags=I2C_M_RD, .buf=data, .len = 3}}; subaddr= 0x14; - tuner_t = 0; + tuner_t = 0; ret = i2c_transfer(&dev->i2c_adap, msg, 2); if (ret != 2) { printk(KERN_ERR "EEPROM read failure\n"); @@ -1015,12 +1015,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, dev->tuner_type = TUNER_PHILIPS_PAL; break; case 0x010C: - dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; + dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; break; default: printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); - } - } else { + } + } else { if ((data[1] != 0) && (data[1] != 0xff)) { /* Hac: new config structure */ subaddr = data[1] + 1; @@ -1046,15 +1046,15 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, } } } - printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type); - saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type; + printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type); + saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type; if (dev->tuner_type == TUNER_PHILIPS_FMD1216ME_MK3) { dev->tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE; saa7134_boards[SAA7134_BOARD_MD7134].tda9887_conf = dev->tda9887_conf; saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG, &dev->tda9887_conf); } saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&dev->tuner_type); - } + } /* initialize hardware #2 */ saa7134_board_init2(dev); @@ -1063,7 +1063,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, /* load i2c helpers */ if (TUNER_ABSENT != dev->tuner_type) request_module("tuner"); - if (dev->tda9887_conf) + if (dev->tda9887_conf) request_module("tda9887"); if (card_is_empress(dev)) { request_module("saa6752hs"); |