Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a75ec3f0 authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4791): Added autodetected flag to the saa7134_dev structure 



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: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 19be685a

drivers/media/video/saa7134/saa7134-core.c

+6 −5
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ 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])
@@ -896,8 +897,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, 
		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");

		dev->board, dev->autodetected ?

		"autodetected" : "insmod option");



	/* get mmio */

	if (!request_mem_region(pci_resource_start(pci_dev,0),

drivers/media/video/saa7134/saa7134.h

+3 −0
Original line number Diff line number Diff line
@@ -448,6 +448,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;