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

Commit 35bbe587 authored by Dmitri Belimov's avatar Dmitri Belimov Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: Fix autodetect for Behold A7 and H7 TV cards 



The entries for those cards are after the generic entries,
so they don't work, in practice. Moving them to happen before the
generic entres fix the issue.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0edf2e5e

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

+12 −12
Original line number Diff line number Diff line
@@ -6660,6 +6660,18 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x13c2,

		.subdevice    = 0x2804,

		.driver_data  = SAA7134_BOARD_TECHNOTREND_BUDGET_T3000,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace, /* Beholder Intl. Ltd. */

		.subdevice    = 0x7190,

		.driver_data  = SAA7134_BOARD_BEHOLD_H7,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace, /* Beholder Intl. Ltd. */

		.subdevice    = 0x7090,

		.driver_data  = SAA7134_BOARD_BEHOLD_A7,

	}, {

		/* --- boards without eeprom + subsystem ID --- */

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -6698,18 +6710,6 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = PCI_ANY_ID,

		.subdevice    = PCI_ANY_ID,

		.driver_data  = SAA7134_BOARD_UNKNOWN,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace, /* Beholder Intl. Ltd. */

		.subdevice    = 0x7190,

		.driver_data  = SAA7134_BOARD_BEHOLD_H7,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace, /* Beholder Intl. Ltd. */

		.subdevice    = 0x7090,

		.driver_data  = SAA7134_BOARD_BEHOLD_A7,

	},{

		/* --- end of list --- */

	}