Mesa (staging/20.1): freedreno: Use the right amount of &'s

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: f3ac8ec54d18f283a84ada93d9e564147c157b1c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3ac8ec54d18f283a84ada93d9e564147c157b1c

Author: Kristian H. Kristensen <hoegsberg at google.com>
Date:   Fri May 22 15:03:55 2020 -0700

freedreno: Use the right amount of &'s

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5176>
(cherry picked from commit 5f365affc906ed9b07857a6fafbb5d51f3f1a607)

---

 .pick_status.json                                 | 2 +-
 src/gallium/drivers/freedreno/freedreno_context.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 06e93389e1f..b517ce7348e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "freedreno: Use the right amount of &'s",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index 529b58e8b54..c9dfa5def6b 100644
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -436,7 +436,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
 	}
 
 #if DETECT_OS_ANDROID
-	if (fd_mesa_debug && FD_DBG_LOG) {
+	if (fd_mesa_debug & FD_DBG_LOG) {
 		static unsigned idx = 0;
 		char *p;
 		asprintf(&p, "/data/fdlog/%s-%d.log", util_get_process_name(), idx++);