From: Simon Glass <sjg@chromium.org>
Date: Sun, 19 Apr 2015 13:21:02 +0000 (-0600)
Subject: dm: test: Don't clear global_data in dm_test_uclass_before_ready()
X-Git-Tag: v2015.07-rc1~69^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f9fd4558ea977f0ad574c829026f26157176cea6;p=u-boot

dm: test: Don't clear global_data in dm_test_uclass_before_ready()

We must not clear global_data even in tests, since the ram_buffer (which
is used by malloc()) will also be lost, and subsequent tests will fail.

Zero only the global_data fields that are required for the test to function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Tested-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/test/dm/core.c b/test/dm/core.c
index 7f7b977972..91be1e5d43 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -651,7 +651,10 @@ static int dm_test_uclass_before_ready(struct dm_test_state *dms)
 
 	ut_assertok(uclass_get(UCLASS_TEST, &uc));
 
-	memset(gd, '\0', sizeof(*gd));
+	gd->dm_root = NULL;
+	gd->dm_root_f = NULL;
+	memset(&gd->uclass_root, '\0', sizeof(gd->uclass_root));
+
 	ut_asserteq_ptr(NULL, uclass_find(UCLASS_TEST));
 
 	return 0;