From 8508e06638c70d588ef749f276eae0cdc4fea5a5 Mon Sep 17 00:00:00 2001
From: Will McVicker <willmcvicker@google.com>
Date: Mon, 8 Feb 2021 11:48:52 -0800
Subject: [PATCH] Revert "ANDROID: staging: debug-kinfo: remove unnecessary
 defer probe"

This reverts commit 8a9ee1c372f344d8bd652f4753af09e19b0e0960. This
driver needs to wait for the debug buffer reserved memory to be mapped.

Bug: 179699380
Change-Id: Ibf72610269323fd4b4df4681d557a51e2ad1b504
Signed-off-by: Will McVicker <willmcvicker@google.com>
(cherry picked from commit c70595eae1fd51d1adf8a99701c1e529f80de593)
Signed-off-by: J. Avila <elavila@google.com>
---
 drivers/staging/android/debug_kinfo.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/staging/android/debug_kinfo.c
index 555bcf538bb3..3d52f7be9376 100644
--- a/drivers/staging/android/debug_kinfo.c
+++ b/drivers/staging/android/debug_kinfo.c
@@ -110,6 +110,11 @@ static int debug_kinfo_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
+	/* Need to wait for reserved memory to be mapped */
+	if (!rmem->priv) {
+		return -EPROBE_DEFER;
+	}
+
 	if (!rmem->base || !rmem->size) {
 		dev_warn(&pdev->dev, "unexpected reserved memory\n");
 		return -EINVAL;