diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /drivers/scsi/ata_piix.c | |
| parent | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
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 6898b7f74389..fb28c1261848 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c | |||
| @@ -647,13 +647,13 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 647 | port_info[1] = NULL; | 647 | port_info[1] = NULL; |
| 648 | 648 | ||
| 649 | if (port_info[0]->host_flags & PIIX_FLAG_AHCI) { | 649 | if (port_info[0]->host_flags & PIIX_FLAG_AHCI) { |
| 650 | u8 tmp; | 650 | u8 tmp; |
| 651 | pci_read_config_byte(pdev, PIIX_SCC, &tmp); | 651 | pci_read_config_byte(pdev, PIIX_SCC, &tmp); |
| 652 | if (tmp == PIIX_AHCI_DEVICE) { | 652 | if (tmp == PIIX_AHCI_DEVICE) { |
| 653 | int rc = piix_disable_ahci(pdev); | 653 | int rc = piix_disable_ahci(pdev); |
| 654 | if (rc) | 654 | if (rc) |
| 655 | return rc; | 655 | return rc; |
| 656 | } | 656 | } |
| 657 | } | 657 | } |
| 658 | 658 | ||
| 659 | if (port_info[0]->host_flags & PIIX_FLAG_COMBINED) { | 659 | if (port_info[0]->host_flags & PIIX_FLAG_COMBINED) { |