aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_sis.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_sis.c')
-rw-r--r--drivers/ata/pata_sis.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 32be13ba5f06..28abfc26e7a4 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -690,8 +690,7 @@ static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)
690static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 690static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
691{ 691{
692 static int printed_version; 692 static int printed_version;
693 struct ata_port_info port; 693 const struct ata_port_info *ppi[] = { NULL, NULL };
694 const struct ata_port_info *ppi[] = { &port, NULL };
695 struct pci_dev *host = NULL; 694 struct pci_dev *host = NULL;
696 struct sis_chipset *chipset = NULL; 695 struct sis_chipset *chipset = NULL;
697 struct sis_chipset *sets; 696 struct sis_chipset *sets;
@@ -831,12 +830,11 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
831 if (chipset == NULL) 830 if (chipset == NULL)
832 return -ENODEV; 831 return -ENODEV;
833 832
834 port = *chipset->info; 833 ppi[0] = chipset->info;
835 port.private_data = chipset;
836 834
837 sis_fixup(pdev, chipset); 835 sis_fixup(pdev, chipset);
838 836
839 return ata_pci_init_one(pdev, ppi, &sis_sht); 837 return ata_pci_init_one(pdev, ppi, &sis_sht, chipset);
840} 838}
841 839
842static const struct pci_device_id sis_pci_tbl[] = { 840static const struct pci_device_id sis_pci_tbl[] = {