IDE fixes

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jul 8, 2007

Subsystems (2)

PCI libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-07-08 14:00 UTC #0 lore raw

PATCH 1/1 IDE fixes

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/

to receive the following updates:

 drivers/ide/legacy/qd65xx.c |    3 +--
 drivers/ide/pci/sis5513.c   |    1 +
 include/linux/pci_ids.h     |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Bartlomiej Zolnierkiewicz (1):
qd65xx: fix PIO mode selection

Uwe Koziolek (1):

      sis5513: adding PCI-ID

drivers/ide/legacy/qd65xx.c +1 -2

index d1414a7..7783745 100644
@@ -258,8 +258,7 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
 	int recovery_time = 415; /* worst case values from the dos driver */
 
 	if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
-		pio = ide_get_best_pio_mode(drive, pio, 255, &d);
-		pio = min_t(u8, pio, 4);
+		pio = ide_get_best_pio_mode(drive, pio, 4, &d);
 
 		switch (pio) {
 			case 0: break;

drivers/ide/pci/sis5513.c +1 -0

index bb6cc4a..ec0adad 100644
@@ -872,6 +872,7 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
 static struct pci_device_id sis5513_pci_tbl[] = {
 	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_1180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);

include/linux/pci_ids.h +1 -0

index 9a03b47..5b1c999 100644
@@ -661,6 +661,7 @@
 #define PCI_DEVICE_ID_SI_965		0x0965
 #define PCI_DEVICE_ID_SI_966		0x0966
 #define PCI_DEVICE_ID_SI_968		0x0968
+#define PCI_DEVICE_ID_SI_1180		0x1180
 #define PCI_DEVICE_ID_SI_5511		0x5511
 #define PCI_DEVICE_ID_SI_5513		0x5513
 #define PCI_DEVICE_ID_SI_5517		0x5517