diff --git a/src/mainboard/amd/dinar/rd890_cfg.c b/src/mainboard/amd/dinar/rd890_cfg.c
index 783c130625..69c4d41831 100644
--- a/src/mainboard/amd/dinar/rd890_cfg.c
+++ b/src/mainboard/amd/dinar/rd890_cfg.c
@@ -82,7 +82,7 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr)
 			}
 			if ((platform_config.PortHotplugMap & (1 << i)) != 0) {
 				u16 j;
-				pPcieConfig->PortConfiguration[j].PortHotplug = ON; /* Enable Hotplug */
+				pPcieConfig->PortConfiguration[i].PortHotplug = ON; /* Enable Hotplug */
 				/* Set Hotplug descriptor info */
 				for (j = 0; j < 8; j++) {
 					u32 PortDescriptor;
diff --git a/src/mainboard/supermicro/h8qgi/rd890_cfg.c b/src/mainboard/supermicro/h8qgi/rd890_cfg.c
index 9c91920d48..a5f6650956 100644
--- a/src/mainboard/supermicro/h8qgi/rd890_cfg.c
+++ b/src/mainboard/supermicro/h8qgi/rd890_cfg.c
@@ -82,7 +82,7 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr)
 			}
 			if ((platform_config.PortHotplugMap & (1 << i)) != 0) {
 				u16 j;
-				pPcieConfig->PortConfiguration[j].PortHotplug = ON; /* Enable Hotplug */
+				pPcieConfig->PortConfiguration[i].PortHotplug = ON; /* Enable Hotplug */
 				/* Set Hotplug descriptor info */
 				for (j = 0; j < 8; j++) {
 					u32 PortDescriptor;
diff --git a/src/mainboard/supermicro/h8scm/rd890_cfg.c b/src/mainboard/supermicro/h8scm/rd890_cfg.c
index 9c91920d48..a5f6650956 100644
--- a/src/mainboard/supermicro/h8scm/rd890_cfg.c
+++ b/src/mainboard/supermicro/h8scm/rd890_cfg.c
@@ -82,7 +82,7 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr)
 			}
 			if ((platform_config.PortHotplugMap & (1 << i)) != 0) {
 				u16 j;
-				pPcieConfig->PortConfiguration[j].PortHotplug = ON; /* Enable Hotplug */
+				pPcieConfig->PortConfiguration[i].PortHotplug = ON; /* Enable Hotplug */
 				/* Set Hotplug descriptor info */
 				for (j = 0; j < 8; j++) {
 					u32 PortDescriptor;
diff --git a/src/mainboard/tyan/s8226/rd890_cfg.c b/src/mainboard/tyan/s8226/rd890_cfg.c
index 9c91920d48..a5f6650956 100644
--- a/src/mainboard/tyan/s8226/rd890_cfg.c
+++ b/src/mainboard/tyan/s8226/rd890_cfg.c
@@ -82,7 +82,7 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr)
 			}
 			if ((platform_config.PortHotplugMap & (1 << i)) != 0) {
 				u16 j;
-				pPcieConfig->PortConfiguration[j].PortHotplug = ON; /* Enable Hotplug */
+				pPcieConfig->PortConfiguration[i].PortHotplug = ON; /* Enable Hotplug */
 				/* Set Hotplug descriptor info */
 				for (j = 0; j < 8; j++) {
 					u32 PortDescriptor;