diff options
| author | Siqi Lin <siqilin@google.com> | 2018-09-06 11:04:10 -0700 |
|---|---|---|
| committer | Siqi Lin <siqilin@google.com> | 2018-09-06 11:04:23 -0700 |
| commit | 62fd7c7873da243600c31e199166cf8fd994cbc7 (patch) | |
| tree | 1b967d9d9ab39d8e5b386d8c422d4753116bf625 | |
| parent | bbf33edfecab0f63e1cb2ca8db2340fdb7bb688f (diff) | |
| parent | ccc11037be3748b22d307ff5ff63f33b848d4362 (diff) | |
Merge branch 'android-msm-wahoo-4.4-pi' into android-msm-wahoo-4.4-pi-qpr1android-9.0.0_r0.37
November 2018.1
Bug: 112384612
Change-Id: Ib7a25b86f12124a95ad39385f3b1f7d7818811fc
Signed-off-by: Siqi Lin <siqilin@google.com>
| -rw-r--r-- | drivers/staging/android/ion/ion_system_heap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index f5437578c362..a8b3ffca2f12 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -2,7 +2,7 @@ * drivers/staging/android/ion/ion_system_heap.c * * Copyright (C) 2011 Google, Inc. - * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2018, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -754,8 +754,10 @@ static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) { int i; for (i = 0; i < num_orders; i++) - if (pools[i]) + if (pools[i]) { ion_page_pool_destroy(pools[i]); + pools[i] = NULL; + } } /** |