diff options
Diffstat (limited to 'drivers/ata/pata_sl82c105.c')
-rw-r--r-- | drivers/ata/pata_sl82c105.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index f8499786917a..5b762acc5687 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/libata.h> | 19 | #include <linux/libata.h> |
20 | 20 | ||
21 | #define DRV_NAME "pata_sl82c105" | 21 | #define DRV_NAME "pata_sl82c105" |
22 | #define DRV_VERSION "0.2.2" | 22 | #define DRV_VERSION "0.2.3" |
23 | 23 | ||
24 | enum { | 24 | enum { |
25 | /* | 25 | /* |
@@ -49,11 +49,8 @@ static int sl82c105_pre_reset(struct ata_port *ap) | |||
49 | }; | 49 | }; |
50 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 50 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
51 | 51 | ||
52 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) { | 52 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) |
53 | ata_port_disable(ap); | 53 | return -ENOENT; |
54 | dev_printk(KERN_INFO, &pdev->dev, "port disabled. ignoring.\n"); | ||
55 | return 0; | ||
56 | } | ||
57 | ap->cbl = ATA_CBL_PATA40; | 54 | ap->cbl = ATA_CBL_PATA40; |
58 | return ata_std_prereset(ap); | 55 | return ata_std_prereset(ap); |
59 | } | 56 | } |
@@ -264,7 +261,7 @@ static struct ata_port_operations sl82c105_port_ops = { | |||
264 | 261 | ||
265 | .qc_prep = ata_qc_prep, | 262 | .qc_prep = ata_qc_prep, |
266 | .qc_issue = ata_qc_issue_prot, | 263 | .qc_issue = ata_qc_issue_prot, |
267 | .eng_timeout = ata_eng_timeout, | 264 | |
268 | .data_xfer = ata_pio_data_xfer, | 265 | .data_xfer = ata_pio_data_xfer, |
269 | 266 | ||
270 | .irq_handler = ata_interrupt, | 267 | .irq_handler = ata_interrupt, |