diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2006-10-30 23:56:59 +0100 |
|---|---|---|
| committer | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2006-10-30 23:56:59 +0100 |
| commit | 859cac86f6c33c51b4e9e2c17bba3ad6b2d6b016 (patch) | |
| tree | e7be432474852c8187956398e9ac34d1424bf775 /linux/drivers/media | |
| parent | 21d23e1b27048f22d886d58886d1b1cd99081b57 (diff) | |
| download | mediapointer-dvb-s2-859cac86f6c33c51b4e9e2c17bba3ad6b2d6b016.tar.gz mediapointer-dvb-s2-859cac86f6c33c51b4e9e2c17bba3ad6b2d6b016.tar.bz2 | |
added autodetected flag to the saa7134_dev structure
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
In case the exact board type needs to be determined by probing
or evaluating the eeprom, this flag allows to still set the
board type via the card=xx insmod option.
This is an extract of a patch by Francis Barber.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 11 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index a65da12e4..601c093eb 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -963,15 +963,16 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, must_configure_manually(); dev->board = SAA7134_BOARD_UNKNOWN; } + dev->autodetected = card[dev->nr] != dev->board; dev->tuner_type = saa7134_boards[dev->board].tuner_type; 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", - dev->name,pci_dev->subsystem_vendor, - pci_dev->subsystem_device,saa7134_boards[dev->board].name, - dev->board, card[dev->nr] == dev->board ? - "insmod option" : "autodetected"); + 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 ? + "autodetected" : "insmod option"); /* get mmio */ if (!request_mem_region(pci_resource_start(pci_dev,0), diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 2b3f39e53..9666b17fc 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -471,6 +471,9 @@ struct saa7134_dev { struct v4l2_prio_state prio; #endif + /* insmod option/autodetected */ + int autodetected; + /* various device info */ unsigned int resources; struct video_device *video_dev; |