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

Commit fe5a2de1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1e5de283 4660897e

drivers/ide/legacy/qd65xx.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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 */

	int recovery_time = 415; /* worst case values from the dos driver */





	if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {

	if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {

		pio = ide_get_best_pio_mode(drive, pio, 255, &d);

		pio = ide_get_best_pio_mode(drive, pio, 4, &d);

		pio = min_t(u8, pio, 4);





		switch (pio) {

		switch (pio) {

			case 0: break;

			case 0: break;

drivers/ide/pci/sis5513.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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[] = {

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_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_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, },

	{ 0, },

};

};

MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);

MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);

include/linux/pci_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -661,6 +661,7 @@ 
#define PCI_DEVICE_ID_SI_965		0x0965

#define PCI_DEVICE_ID_SI_965		0x0965

#define PCI_DEVICE_ID_SI_966		0x0966

#define PCI_DEVICE_ID_SI_966		0x0966

#define PCI_DEVICE_ID_SI_968		0x0968

#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_5511		0x5511

#define PCI_DEVICE_ID_SI_5513		0x5513

#define PCI_DEVICE_ID_SI_5513		0x5513

#define PCI_DEVICE_ID_SI_5517		0x5517

#define PCI_DEVICE_ID_SI_5517		0x5517