diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /drivers/ata/sata_sis.c | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/sata_sis.c')
| -rw-r--r-- | drivers/ata/sata_sis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index 9b17375d8056..18d49fff8dc4 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
| @@ -240,7 +240,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 240 | struct ata_probe_ent *probe_ent = NULL; | 240 | struct ata_probe_ent *probe_ent = NULL; |
| 241 | int rc; | 241 | int rc; |
| 242 | u32 genctl; | 242 | u32 genctl; |
| 243 | struct ata_port_info *ppi; | 243 | struct ata_port_info *ppi[2]; |
| 244 | int pci_dev_busy = 0; | 244 | int pci_dev_busy = 0; |
| 245 | u8 pmr; | 245 | u8 pmr; |
| 246 | u8 port2_start; | 246 | u8 port2_start; |
| @@ -265,8 +265,8 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 265 | if (rc) | 265 | if (rc) |
| 266 | goto err_out_regions; | 266 | goto err_out_regions; |
| 267 | 267 | ||
| 268 | ppi = &sis_port_info; | 268 | ppi[0] = ppi[1] = &sis_port_info; |
| 269 | probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); | 269 | probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); |
| 270 | if (!probe_ent) { | 270 | if (!probe_ent) { |
| 271 | rc = -ENOMEM; | 271 | rc = -ENOMEM; |
| 272 | goto err_out_regions; | 272 | goto err_out_regions; |