diff options
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index ab2ecccf7798..5719704eb0ee 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -643,11 +643,9 @@ static int piix_pata_prereset(struct ata_port *ap) | |||
| 643 | { | 643 | { |
| 644 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 644 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
| 645 | 645 | ||
| 646 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) { | 646 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) |
| 647 | ata_port_printk(ap, KERN_INFO, "port disabled. ignoring.\n"); | 647 | return -ENOENT; |
| 648 | ap->eh_context.i.action &= ~ATA_EH_RESET_MASK; | 648 | |
| 649 | return 0; | ||
| 650 | } | ||
| 651 | ap->cbl = ATA_CBL_PATA40; | 649 | ap->cbl = ATA_CBL_PATA40; |
| 652 | return ata_std_prereset(ap); | 650 | return ata_std_prereset(ap); |
| 653 | } | 651 | } |
| @@ -851,7 +849,7 @@ static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
| 851 | * @ap: Port whose timings we are configuring | 849 | * @ap: Port whose timings we are configuring |
| 852 | * @adev: Drive in question | 850 | * @adev: Drive in question |
| 853 | * @udma: udma mode, 0 - 6 | 851 | * @udma: udma mode, 0 - 6 |
| 854 | * @is_ich: set if the chip is an ICH device | 852 | * @isich: set if the chip is an ICH device |
| 855 | * | 853 | * |
| 856 | * Set UDMA mode for device, in host controller PCI config space. | 854 | * Set UDMA mode for device, in host controller PCI config space. |
| 857 | * | 855 | * |
