diff options
author | Alan Cox <alan@redhat.com> | 2007-03-27 01:43:41 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 14:16:00 -0400 |
commit | c45a6328742be39eee351a4ac7a5e60f7d048846 (patch) | |
tree | aa5acc21a336c8b1c90278631555b5a1021426f2 | |
parent | 3b4ba5910b150c5db019642899d7b6ba9bec27b4 (diff) |
pata_sl82c105: restore cable detect method
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/ata/pata_sl82c105.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index b681441cfcb9..da9e22b25753 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -58,7 +58,6 @@ static int sl82c105_pre_reset(struct ata_port *ap) | |||
58 | 58 | ||
59 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) | 59 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) |
60 | return -ENOENT; | 60 | return -ENOENT; |
61 | ap->cbl = ATA_CBL_PATA40; | ||
62 | return ata_std_prereset(ap); | 61 | return ata_std_prereset(ap); |
63 | } | 62 | } |
64 | 63 | ||
@@ -238,6 +237,7 @@ static struct ata_port_operations sl82c105_port_ops = { | |||
238 | .thaw = ata_bmdma_thaw, | 237 | .thaw = ata_bmdma_thaw, |
239 | .error_handler = sl82c105_error_handler, | 238 | .error_handler = sl82c105_error_handler, |
240 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | 239 | .post_internal_cmd = ata_bmdma_post_internal_cmd, |
240 | .cable_detect = ata_cable_40wire, | ||
241 | 241 | ||
242 | .bmdma_setup = ata_bmdma_setup, | 242 | .bmdma_setup = ata_bmdma_setup, |
243 | .bmdma_start = sl82c105_bmdma_start, | 243 | .bmdma_start = sl82c105_bmdma_start, |