Merge commit 'v3.17' into next

1 files changed, 1 insertions, 2 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 5db37cef50a9..0a49632fac47 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -351,8 +351,7 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
         for (i = 0; i < pd->nr_chips; i++) {
                 port_index = 0;
                 while (port_index < DSA_MAX_PORTS) {
-                        if (pd->chip[i].port_names[port_index])
-                                kfree(pd->chip[i].port_names[port_index]);
+                        kfree(pd->chip[i].port_names[port_index]);
                         port_index++;
                 }
                 kfree(pd->chip[i].rtable);