git.openwrt.org Git - openwrt/staging/ldir.git/blob

   1 From a9848cf13f495e12c55a01d437120efbb70ed747 Mon Sep 17 00:00:00 2001
   2 From: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
   3 Date: Fri, 29 Nov 2019 15:48:20 +0800
   4 Subject: [PATCH] net: dsa: ocelot: alloc memory for dsa switch instance
   5
   6 The dsa switch instance hasn't alloc memory for switch ports in felix
   7 initialization driver, which will cause NULL pointer issue. Using
   8 dsa_switch_alloc to alloc memory for dsa switch instance.
   9
  10 Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
  11 ---
  12  drivers/net/dsa/ocelot/felix.c | 2 +-
  13  1 file changed, 1 insertion(+), 1 deletion(-)
  14
  15 --- a/drivers/net/dsa/ocelot/felix.c
  16 +++ b/drivers/net/dsa/ocelot/felix.c
  17 @@ -510,7 +510,7 @@ static int felix_pci_probe(struct pci_de
  18
  19         ocelot->ptp = 1;
  20
  21 -       ds = kzalloc(sizeof(struct dsa_switch), GFP_KERNEL);
  22 +       ds = dsa_switch_alloc(&pdev->dev, felix->info->num_ports);
  23         if (!ds) {
  24                 err = -ENOMEM;
  25                 dev_err(&pdev->dev, "Failed to allocate DSA switch\n");