diff options
Diffstat (limited to 'drivers/ata/pata_sis.c')
-rw-r--r-- | drivers/ata/pata_sis.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 2e555168b431..fce74d9b2e67 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/ata.h> | 34 | #include <linux/ata.h> |
35 | 35 | ||
36 | #define DRV_NAME "pata_sis" | 36 | #define DRV_NAME "pata_sis" |
37 | #define DRV_VERSION "0.4.3" | 37 | #define DRV_VERSION "0.4.4" |
38 | 38 | ||
39 | struct sis_chipset { | 39 | struct sis_chipset { |
40 | u16 device; /* PCI host ID */ | 40 | u16 device; /* PCI host ID */ |
@@ -74,11 +74,9 @@ static int sis_133_pre_reset(struct ata_port *ap) | |||
74 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 74 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
75 | u16 tmp; | 75 | u16 tmp; |
76 | 76 | ||
77 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) { | 77 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) |
78 | ata_port_disable(ap); | 78 | return -ENOENT; |
79 | printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id); | 79 | |
80 | return 0; | ||
81 | } | ||
82 | /* The top bit of this register is the cable detect bit */ | 80 | /* The top bit of this register is the cable detect bit */ |
83 | pci_read_config_word(pdev, 0x50 + 2 * ap->port_no, &tmp); | 81 | pci_read_config_word(pdev, 0x50 + 2 * ap->port_no, &tmp); |
84 | if (tmp & 0x8000) | 82 | if (tmp & 0x8000) |