On 18/09/2020 04:07:26+0300, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.olt...@nxp.com> > > Do not proceed probing if we couldn't allocate memory for the ports > array, just error out. > > Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com> > Reviewed-by: Horatiu Vultur <horatiu.vul...@microchip.com>
Tested-by: Alexandre Belloni <alexandre.bell...@bootlin.com> Reviewed-by: Alexandre Belloni <alexandre.bell...@bootlin.com> > --- > Changes in v2: > Stopped leaking the 'ports' OF node. > > drivers/net/ethernet/mscc/ocelot_vsc7514.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c > b/drivers/net/ethernet/mscc/ocelot_vsc7514.c > index 65408bc994c4..904ea299a5e8 100644 > --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c > +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c > @@ -993,6 +993,10 @@ static int mscc_ocelot_probe(struct platform_device > *pdev) > > ocelot->ports = devm_kcalloc(&pdev->dev, ocelot->num_phys_ports, > sizeof(struct ocelot_port *), GFP_KERNEL); > + if (!ocelot->ports) { > + err = -ENOMEM; > + goto out_put_ports; > + } > > ocelot->vcap_is2_keys = vsc7514_vcap_is2_keys; > ocelot->vcap_is2_actions = vsc7514_vcap_is2_actions; > -- > 2.25.1 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com