summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2017-03-27 19:52:00 +0200
committerTejun Heo <tj@kernel.org>2017-03-27 19:52:00 +0200
commita431ecd2d459da3c91a612061f09eb422ffe78e2 (patch)
tree1332d6baf7b8f5fabb84046ce33bdaca71752df1 /drivers
parentahci: qoriq: correct the sata ecc setting error (diff)
downloadlinux-a431ecd2d459da3c91a612061f09eb422ffe78e2.tar.xz
linux-a431ecd2d459da3c91a612061f09eb422ffe78e2.zip
Revert "pata_atiixp: Don't use unconnected secondary port on SB600/SB700"
This reverts commit 5946fdaee4ba449e8fbb5d403e1ed69437f916e8. The original commit's assumption that the secondary port is unconnected turns out to be false. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Markku Pesonen <tourula@gmail.com> Fixes: 5946fdaee4ba ("pata_atiixp: Don't use unconnected secondary port on SB600/SB700") Cc: Darren Stevens <darren@stevens-zone.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_atiixp.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 6c9aa95a9a05..49d705c9f0f7 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -278,11 +278,6 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
};
const struct ata_port_info *ppi[] = { &info, &info };
- /* SB600/700 don't have secondary port wired */
- if ((pdev->device == PCI_DEVICE_ID_ATI_IXP600_IDE) ||
- (pdev->device == PCI_DEVICE_ID_ATI_IXP700_IDE))
- ppi[1] = &ata_dummy_port_info;
-
return ata_pci_bmdma_init_one(pdev, ppi, &atiixp_sht, NULL,
ATA_HOST_PARALLEL_SCAN);
}