Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
authored by Dmitri Belimov and committed by Mauro Carvalho Chehab 35bbe587 0edf2e5e
+12
-12
drivers/media/video/saa7134/saa7134-cards.c
+12
-12
drivers/media/video/saa7134/saa7134-cards.c
···
6661
.subdevice = 0x2804,
6662
.driver_data = SAA7134_BOARD_TECHNOTREND_BUDGET_T3000,
6663
}, {
6664
/* --- boards without eeprom + subsystem ID --- */
6665
.vendor = PCI_VENDOR_ID_PHILIPS,
6666
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
···
6710
.subvendor = PCI_ANY_ID,
6711
.subdevice = PCI_ANY_ID,
6712
.driver_data = SAA7134_BOARD_UNKNOWN,
6713
-
}, {
6714
-
.vendor = PCI_VENDOR_ID_PHILIPS,
6715
-
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6716
-
.subvendor = 0x5ace, /* Beholder Intl. Ltd. */
6717
-
.subdevice = 0x7190,
6718
-
.driver_data = SAA7134_BOARD_BEHOLD_H7,
6719
-
}, {
6720
-
.vendor = PCI_VENDOR_ID_PHILIPS,
6721
-
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6722
-
.subvendor = 0x5ace, /* Beholder Intl. Ltd. */
6723
-
.subdevice = 0x7090,
6724
-
.driver_data = SAA7134_BOARD_BEHOLD_A7,
6725
},{
6726
/* --- end of list --- */
6727
}
···
6661
.subdevice = 0x2804,
6662
.driver_data = SAA7134_BOARD_TECHNOTREND_BUDGET_T3000,
6663
}, {
6664
+
.vendor = PCI_VENDOR_ID_PHILIPS,
6665
+
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6666
+
.subvendor = 0x5ace, /* Beholder Intl. Ltd. */
6667
+
.subdevice = 0x7190,
6668
+
.driver_data = SAA7134_BOARD_BEHOLD_H7,
6669
+
}, {
6670
+
.vendor = PCI_VENDOR_ID_PHILIPS,
6671
+
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6672
+
.subvendor = 0x5ace, /* Beholder Intl. Ltd. */
6673
+
.subdevice = 0x7090,
6674
+
.driver_data = SAA7134_BOARD_BEHOLD_A7,
6675
+
}, {
6676
/* --- boards without eeprom + subsystem ID --- */
6677
.vendor = PCI_VENDOR_ID_PHILIPS,
6678
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
···
6698
.subvendor = PCI_ANY_ID,
6699
.subdevice = PCI_ANY_ID,
6700
.driver_data = SAA7134_BOARD_UNKNOWN,
6701
},{
6702
/* --- end of list --- */
6703
}