1 files changed, 4 insertions, 2 deletions

diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
index b8ef965705cf..2f5bbd68e9a0 100644
--- a/arch/mips/bcm47xx/serial.c
+++ b/arch/mips/bcm47xx/serial.c
@@ -31,7 +31,8 @@ static int __init uart8250_init_ssb(void)
 
         memset(&uart8250_data, 0,  sizeof(uart8250_data));
 
-        for (i = 0; i < mcore->nr_serial_ports; i++) {
+        for (i = 0; i < mcore->nr_serial_ports &&
+                    i < ARRAY_SIZE(uart8250_data) - 1; i++) {
                 struct plat_serial8250_port *p = &(uart8250_data[i]);
                 struct ssb_serial_port *ssb_port = &(mcore->serial_ports[i]);
 
@@ -55,7 +56,8 @@ static int __init uart8250_init_bcma(void)
 
         memset(&uart8250_data, 0,  sizeof(uart8250_data));
 
-        for (i = 0; i < cc->nr_serial_ports; i++) {
+        for (i = 0; i < cc->nr_serial_ports &&
+                    i < ARRAY_SIZE(uart8250_data) - 1; i++) {
                 struct plat_serial8250_port *p = &(uart8250_data[i]);
                 struct bcma_serial_port *bcma_port;
                 bcma_port = &(cc->serial_ports[i]);