Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
qd65xx: fix PIO mode selection
sis5513: adding PCI-ID
+3
-2
+1
-2
drivers/ide/legacy/qd65xx.c
+1
-2
drivers/ide/legacy/qd65xx.c
···
258
258
int recovery_time = 415; /* worst case values from the dos driver */
259
259
260
260
if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
261
-
pio = ide_get_best_pio_mode(drive, pio, 255, &d);
262
-
pio = min_t(u8, pio, 4);
261
+
pio = ide_get_best_pio_mode(drive, pio, 4, &d);
263
262
264
263
switch (pio) {
265
264
case 0: break;
+1
drivers/ide/pci/sis5513.c
+1
drivers/ide/pci/sis5513.c
···
872
872
static struct pci_device_id sis5513_pci_tbl[] = {
873
873
{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
874
874
{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
875
+
{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_1180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
875
876
{ 0, },
876
877
};
877
878
MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
+1
include/linux/pci_ids.h
+1
include/linux/pci_ids.h
···
661
661
#define PCI_DEVICE_ID_SI_965 0x0965
662
662
#define PCI_DEVICE_ID_SI_966 0x0966
663
663
#define PCI_DEVICE_ID_SI_968 0x0968
664
+
#define PCI_DEVICE_ID_SI_1180 0x1180
664
665
#define PCI_DEVICE_ID_SI_5511 0x5511
665
666
#define PCI_DEVICE_ID_SI_5513 0x5513
666
667
#define PCI_DEVICE_ID_SI_5517 0x5517