diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:03:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:03:46 -0400 |
| commit | 5be1d85c208f135fc88f972f91b91a879b702b40 (patch) | |
| tree | 6ca884e6cd58d596a64ef12fa62405524d6cd5f1 /drivers/scsi/ata_piix.c | |
| parent | 69be8f189653cd81aae5a74e26615b12871bb72e (diff) | |
| parent | 135932651fd1eeb95eb6c5d4f6652aae73fe2c24 (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/ata_piix.c')
| -rw-r--r-- | drivers/scsi/ata_piix.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c index d96ebf9d2228..03695616e59e 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c | |||
| @@ -629,13 +629,13 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 629 | port_info[1] = NULL; | 629 | port_info[1] = NULL; |
| 630 | 630 | ||
| 631 | if (port_info[0]->host_flags & PIIX_FLAG_AHCI) { | 631 | if (port_info[0]->host_flags & PIIX_FLAG_AHCI) { |
| 632 | u8 tmp; | 632 | u8 tmp; |
| 633 | pci_read_config_byte(pdev, PIIX_SCC, &tmp); | 633 | pci_read_config_byte(pdev, PIIX_SCC, &tmp); |
| 634 | if (tmp == PIIX_AHCI_DEVICE) { | 634 | if (tmp == PIIX_AHCI_DEVICE) { |
| 635 | int rc = piix_disable_ahci(pdev); | 635 | int rc = piix_disable_ahci(pdev); |
| 636 | if (rc) | 636 | if (rc) |
| 637 | return rc; | 637 | return rc; |
| 638 | } | 638 | } |
| 639 | } | 639 | } |
| 640 | 640 | ||
| 641 | if (port_info[0]->host_flags & PIIX_FLAG_COMBINED) { | 641 | if (port_info[0]->host_flags & PIIX_FLAG_COMBINED) { |