diff options
-rw-r--r-- | drivers/ata/pata_hpt37x.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 7350443948c1..fce3fcdc7e79 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/libata.h> | 25 | #include <linux/libata.h> |
26 | 26 | ||
27 | #define DRV_NAME "pata_hpt37x" | 27 | #define DRV_NAME "pata_hpt37x" |
28 | #define DRV_VERSION "0.5" | 28 | #define DRV_VERSION "0.5.1" |
29 | 29 | ||
30 | struct hpt_clock { | 30 | struct hpt_clock { |
31 | u8 xfer_speed; | 31 | u8 xfer_speed; |
@@ -453,7 +453,13 @@ static int hpt37x_pre_reset(struct ata_port *ap) | |||
453 | { | 453 | { |
454 | u8 scr2, ata66; | 454 | u8 scr2, ata66; |
455 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 455 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
456 | 456 | static const struct pci_bits hpt37x_enable_bits[] = { | |
457 | { 0x50, 1, 0x04, 0x04 }, | ||
458 | { 0x54, 1, 0x04, 0x04 } | ||
459 | }; | ||
460 | if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no])) | ||
461 | return -ENOENT; | ||
462 | |||
457 | pci_read_config_byte(pdev, 0x5B, &scr2); | 463 | pci_read_config_byte(pdev, 0x5B, &scr2); |
458 | pci_write_config_byte(pdev, 0x5B, scr2 & ~0x01); | 464 | pci_write_config_byte(pdev, 0x5B, scr2 & ~0x01); |
459 | /* Cable register now active */ | 465 | /* Cable register now active */ |
@@ -488,10 +494,17 @@ static void hpt37x_error_handler(struct ata_port *ap) | |||
488 | 494 | ||
489 | static int hpt374_pre_reset(struct ata_port *ap) | 495 | static int hpt374_pre_reset(struct ata_port *ap) |
490 | { | 496 | { |
497 | static const struct pci_bits hpt37x_enable_bits[] = { | ||
498 | { 0x50, 1, 0x04, 0x04 }, | ||
499 | { 0x54, 1, 0x04, 0x04 } | ||
500 | }; | ||
491 | u16 mcr3, mcr6; | 501 | u16 mcr3, mcr6; |
492 | u8 ata66; | 502 | u8 ata66; |
493 | |||
494 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 503 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
504 | |||
505 | if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no])) | ||
506 | return -ENOENT; | ||
507 | |||
495 | /* Do the extra channel work */ | 508 | /* Do the extra channel work */ |
496 | pci_read_config_word(pdev, 0x52, &mcr3); | 509 | pci_read_config_word(pdev, 0x52, &mcr3); |
497 | pci_read_config_word(pdev, 0x56, &mcr6); | 510 | pci_read_config_word(pdev, 0x56, &mcr6); |