Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / dsa / dsa.c

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index aa2ff583b7ed7f4802c5c3bf6541b396b9b1cd3d..0eb5d5e76dfbe1f99537e8a561f1671389c09e16 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -350,9 +350,11 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
 
        for (i = 0; i < pd->nr_chips; i++) {
                port_index = 0;
-               while (pd->chip[i].port_names &&
-                       pd->chip[i].port_names[++port_index])
-                       kfree(pd->chip[i].port_names[port_index]);
+               while (port_index < DSA_MAX_PORTS) {
+                       if (pd->chip[i].port_names[port_index])
+                               kfree(pd->chip[i].port_names[port_index]);
+                       port_index++;
+               }
                kfree(pd->chip[i].rtable);
        }
        kfree(pd->chip);