]> Pileus Git - ~andy/linux/commitdiff
drivers: net: ethernet: cpsw: consider number of slaves in interation
authorDaniel Mack <zonque@gmail.com>
Tue, 26 Feb 2013 04:06:20 +0000 (04:06 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Feb 2013 22:26:11 +0000 (17:26 -0500)
Make cpsw_add_default_vlan() look at the actual number of slaves for its
iteration, so boards with less than 2 slaves don't ooops at boot.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: David S. Miller <davem@davemloft.net>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c

index 7e93df6585e7fd7cce9db2ba3f9ed3187f2b699c..01ffbc48698298d1678b478599c1b46f2ee55ef9 100644 (file)
@@ -731,7 +731,7 @@ static inline void cpsw_add_default_vlan(struct cpsw_priv *priv)
 
        writel(vlan, &priv->host_port_regs->port_vlan);
 
-       for (i = 0; i < 2; i++)
+       for (i = 0; i < priv->data.slaves; i++)
                slave_write(priv->slaves + i, vlan, reg);
 
        cpsw_ale_add_vlan(priv->ale, vlan, ALE_ALL_PORTS << port,