diff options
-rw-r--r-- | drivers/ata/libata-core.c | 6 | ||||
-rw-r--r-- | drivers/ata/pata_ali.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_ninja32.c | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 3dd0e942df36..bb9e025522ba 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -4374,11 +4374,11 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) | |||
4374 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING; | 4374 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING; |
4375 | tf.protocol = ATA_PROT_NODATA; | 4375 | tf.protocol = ATA_PROT_NODATA; |
4376 | /* If we are using IORDY we must send the mode setting command */ | 4376 | /* If we are using IORDY we must send the mode setting command */ |
4377 | if (ata_pio_need_iordy(dev)) | 4377 | if (ata_pio_need_iordy(dev)) |
4378 | tf.nsect = dev->xfer_mode; | 4378 | tf.nsect = dev->xfer_mode; |
4379 | /* If the device has IORDY and the controller does not - turn it off */ | 4379 | /* If the device has IORDY and the controller does not - turn it off */ |
4380 | else if (ata_id_has_iordy(dev->id)) | 4380 | else if (ata_id_has_iordy(dev->id)) |
4381 | tf.nsect = 0x01; | 4381 | tf.nsect = 0x01; |
4382 | else /* In the ancient relic department - skip all of this */ | 4382 | else /* In the ancient relic department - skip all of this */ |
4383 | return 0; | 4383 | return 0; |
4384 | 4384 | ||
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 8caf9afc8b90..7e68edf3c0f3 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -64,7 +64,7 @@ static int ali_cable_override(struct pci_dev *pdev) | |||
64 | if (pdev->subsystem_vendor == 0x10CF && pdev->subsystem_device == 0x10AF) | 64 | if (pdev->subsystem_vendor == 0x10CF && pdev->subsystem_device == 0x10AF) |
65 | return 1; | 65 | return 1; |
66 | /* Mitac 8317 (Winbook-A) and relatives */ | 66 | /* Mitac 8317 (Winbook-A) and relatives */ |
67 | if (pdev->subsystem_vendor == 0x1071 && pdev->subsystem_device == 0x8317) | 67 | if (pdev->subsystem_vendor == 0x1071 && pdev->subsystem_device == 0x8317) |
68 | return 1; | 68 | return 1; |
69 | /* Systems by DMI */ | 69 | /* Systems by DMI */ |
70 | if (dmi_check_system(cable_dmi_table)) | 70 | if (dmi_check_system(cable_dmi_table)) |
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index 04acd3f86120..1c1b83541d13 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c | |||
@@ -61,7 +61,8 @@ static void ninja32_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
61 | static u16 pio_timing[5] = { | 61 | static u16 pio_timing[5] = { |
62 | 0xd6, 0x85, 0x44, 0x33, 0x13 | 62 | 0xd6, 0x85, 0x44, 0x33, 0x13 |
63 | }; | 63 | }; |
64 | iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0], ap->ioaddr.bmdma_addr + 0x1f); | 64 | iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0], |
65 | ap->ioaddr.bmdma_addr + 0x1f); | ||
65 | ap->private_data = adev; | 66 | ap->private_data = adev; |
66 | } | 67 | } |
67 | 68 | ||
@@ -176,12 +177,13 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
176 | iowrite8(0xB3, base + 0x02); /* Burst, ?? setup */ | 177 | iowrite8(0xB3, base + 0x02); /* Burst, ?? setup */ |
177 | iowrite8(0x00, base + 0x04); /* WAIT0 ? */ | 178 | iowrite8(0x00, base + 0x04); /* WAIT0 ? */ |
178 | /* FIXME: Should we disable them at remove ? */ | 179 | /* FIXME: Should we disable them at remove ? */ |
179 | return ata_host_activate(host, dev->irq, ata_interrupt, IRQF_SHARED, &ninja32_sht); | 180 | return ata_host_activate(host, dev->irq, ata_interrupt, |
181 | IRQF_SHARED, &ninja32_sht); | ||
180 | } | 182 | } |
181 | 183 | ||
182 | static const struct pci_device_id ninja32[] = { | 184 | static const struct pci_device_id ninja32[] = { |
183 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 185 | { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
184 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 186 | { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
185 | { }, | 187 | { }, |
186 | }; | 188 | }; |
187 | 189 | ||