|
@@ -93,7 +93,7 @@
|
|
|
#include <linux/libata.h>
|
|
|
|
|
|
#define DRV_NAME "ata_piix"
|
|
|
-#define DRV_VERSION "2.10"
|
|
|
+#define DRV_VERSION "2.10ac1"
|
|
|
|
|
|
enum {
|
|
|
PIIX_IOCFG = 0x54, /* IDE I/O configuration register */
|
|
@@ -667,14 +667,9 @@ static int ich_pata_prereset(struct ata_port *ap)
|
|
|
{
|
|
|
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
|
|
|
|
|
|
- if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) {
|
|
|
- ata_port_printk(ap, KERN_INFO, "port disabled. ignoring.\n");
|
|
|
- ap->eh_context.i.action &= ~ATA_EH_RESET_MASK;
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
+ if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
|
|
|
+ return -ENOENT;
|
|
|
ich_pata_cbl_detect(ap);
|
|
|
-
|
|
|
return ata_std_prereset(ap);
|
|
|
}
|
|
|
|