| Message ID | 1464972256-10408-2-git-send-email-andrew@lunn.ch |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 06/03/2016 09:44 AM, Andrew Lunn wrote: > The new binding does not make use of dsa_chip_data, a.k.a cd. When > retrieving the size of the EEPROM attached to a switch, don't assume > there is a cd attached to the switch structure. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Andrew Lunn <andrew@lunn.ch> writes: > The new binding does not make use of dsa_chip_data, a.k.a cd. When > retrieving the size of the EEPROM attached to a switch, don't assume > there is a cd attached to the switch structure. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 152436cdab30..135a91706755 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -615,7 +615,7 @@ static int dsa_slave_get_eeprom_len(struct net_device *dev) struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_switch *ds = p->parent; - if (ds->cd->eeprom_len) + if (ds->cd && ds->cd->eeprom_len) return ds->cd->eeprom_len; if (ds->drv->get_eeprom_len)
The new binding does not make use of dsa_chip_data, a.k.a cd. When retrieving the size of the EEPROM attached to a switch, don't assume there is a cd attached to the switch structure. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- net/dsa/slave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)