mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 11:13:53 +02:00
e06544bdbe
The change which backported the of_get_mac_address() change broke some
patches in the layerscape target so the patches did not apply any more.
This commit makes them apply again and also fixes some other problems
related to this change.
Fixes commit 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
29 lines
852 B
Diff
29 lines
852 B
Diff
From 1ccc18ca96d8a824f2af45d1046d23ccdb90f3df Mon Sep 17 00:00:00 2001
|
|
From: Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
|
|
Date: Wed, 8 Jan 2020 12:18:40 +0530
|
|
Subject: [PATCH] staging: fsl_ppfe/eth: Enhance error checking in platform
|
|
probe
|
|
|
|
Fix the kernel crash when MAC addr is not passed in dtb.
|
|
|
|
Signed-off-by: Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
|
|
---
|
|
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
|
+++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
|
@@ -31,7 +31,11 @@ static int pfe_get_gemac_if_properties(s
|
|
const u32 *addr;
|
|
|
|
addr = of_get_property(gem, "reg", &size);
|
|
- port = be32_to_cpup(addr);
|
|
+ if (addr)
|
|
+ port = be32_to_cpup(addr);
|
|
+ else
|
|
+ goto err;
|
|
+
|
|
|
|
pdata->ls1012a_eth_pdata[port].gem_id = port;
|
|
|