From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 8 Apr 2013 08:24:50 +0000 (+0000)
Subject: ramips: avoid invalid pointer dereference in pinmux code
X-Git-Tag: reboot~10717
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cd7ce5226da31972687f9bd773afaadffd250013;p=openwrt%2Fstaging%2Fjogo.git

ramips: avoid invalid pointer dereference in pinmux code

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 36269
---

diff --git a/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch b/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch
index 08cd2428f7..d5c037e2e3 100644
--- a/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch
+++ b/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch
@@ -19,11 +19,14 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  	u32 mode = 0;
  
  	np = of_find_compatible_node(NULL, NULL, "ralink,rt3050-sysc");
-@@ -76,5 +76,17 @@ void ralink_pinmux(void)
+@@ -76,5 +76,20 @@ void ralink_pinmux(void)
  	if (wdt && *wdt && rt_pinmux.wdt_reset)
  		rt_pinmux.wdt_reset();
  
-+	of_property_read_string(np, "ralink,pcimux", &pci);
++	pci = NULL;
++	if (rt_pinmux.pci)
++		of_property_read_string(np, "ralink,pcimux", &pci);
++
 +	if (pci) {
 +		int m = ralink_mux_mask(pci, rt_pinmux.pci);
 +		mode &= ~(rt_pinmux.pci_mask << rt_pinmux.pci_shift);