summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaoliang Yang <xiaoliang.yang_1@nxp.com>2019-11-29 15:48:20 +0800
committerDong Aisheng <aisheng.dong@nxp.com>2019-12-02 18:04:48 +0800
commitbb849431a970cf8494f718ac630c2f93e6891b78 (patch)
tree64a06d2eb55cc552e125224d8fea1f243a125608
parenteca0b86bb007adc0d571abd763c220cd631580b8 (diff)
net: dsa: ocelot: alloc memory for dsa switch instance
The dsa switch instance hasn't alloc memory for switch ports in felix initialization driver, which will cause NULL pointer issue. Using dsa_switch_alloc to alloc memory for dsa switch instance. Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
-rw-r--r--drivers/net/dsa/ocelot/felix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 57b4421037e0..ac6908cf4997 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -510,7 +510,7 @@ static int felix_pci_probe(struct pci_dev *pdev,
ocelot->ptp = 1;
- ds = kzalloc(sizeof(struct dsa_switch), GFP_KERNEL);
+ ds = dsa_switch_alloc(&pdev->dev, felix->info->num_ports);
if (!ds) {
err = -ENOMEM;
dev_err(&pdev->dev, "Failed to allocate DSA switch\n");