summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorTyrel Datwyler2013-08-15 07:23:45 +0200
committerBenjamin Herrenschmidt2013-08-27 06:45:10 +0200
commitd8e533b45fd98aa72957d9580d97aa0ab45265ad (patch)
tree5893062a920f299f6f8ed0d1323a81667bfd53f1 /arch/powerpc
parentpowerpc: Skip emulating & leave interrupts off for kernel program checks (diff)
downloadkernel-qcow2-linux-d8e533b45fd98aa72957d9580d97aa0ab45265ad.tar.gz
kernel-qcow2-linux-d8e533b45fd98aa72957d9580d97aa0ab45265ad.tar.xz
kernel-qcow2-linux-d8e533b45fd98aa72957d9580d97aa0ab45265ad.zip
powerpc/pseries: Fix creation of loop in device node property list
The update_dt_prop helper function fails to set the IN/OUT parameter prop to NULL after a complete property has been parsed from the work area returned by the ibm,update-properties rtas function. This results in the property list of the device node being updated is corrupted and becomes a loop since the same property structure is used repeatedly. Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> Acked-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/pseries/mobility.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index 3d01eee9ffb1..f28abeeecbd5 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -119,7 +119,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
if (!more) {
of_update_property(dn, new_prop);
- new_prop = NULL;
+ *prop = NULL;
}
return 0;