You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
937 B
Diff
26 lines
937 B
Diff
From a9848cf13f495e12c55a01d437120efbb70ed747 Mon Sep 17 00:00:00 2001
|
|
From: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
|
|
Date: Fri, 29 Nov 2019 15:48:20 +0800
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/dsa/ocelot/felix.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- 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_de
|
|
|
|
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");
|