1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index cb965f41d093..c6c8a8bb06d0 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -417,7 +417,7 @@ static void hpt36x_init_chipset(struct pci_dev *dev)
 
 static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info_hpt366 = {
+        static const struct ata_port_info info_hpt366 = {
                 .sht = &hpt36x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -425,7 +425,8 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x1f,
                 .port_ops = &hpt366_port_ops
         };
-        struct ata_port_info *port_info[2] = {&info_hpt366, &info_hpt366};
+        struct ata_port_info info = info_hpt366;
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         u32 class_rev;
         u32 reg1;
@@ -446,17 +447,17 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         /* info_hpt366 is safe against re-entry so we can scribble on it */
         switch((reg1 & 0x700) >> 8) {
                 case 5:
-                        info_hpt366.private_data = &hpt366_40;
+                        info.private_data = &hpt366_40;
                         break;
                 case 9:
-                        info_hpt366.private_data = &hpt366_25;
+                        info.private_data = &hpt366_25;
                         break;
                 default:
-                        info_hpt366.private_data = &hpt366_33;
+                        info.private_data = &hpt366_33;
                         break;
         }
         /* Now kick off ATA set up */
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 #ifdef CONFIG_PM