summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gasket
diff options
context:
space:
mode:
authorNick Ewalt2018-09-17 14:39:02 +0200
committerGreg Kroah-Hartman2018-09-18 13:22:01 +0200
commitc3873a5c741f75847ae50a3f566fea2c171c1054 (patch)
treee1d34cb24963cf76b116e9e7b41e05f5342c49ac /drivers/staging/gasket
parentstaging: gasket: page_table: don't unmap coherent pages (diff)
downloadkernel-qcow2-linux-c3873a5c741f75847ae50a3f566fea2c171c1054.tar.gz
kernel-qcow2-linux-c3873a5c741f75847ae50a3f566fea2c171c1054.tar.xz
kernel-qcow2-linux-c3873a5c741f75847ae50a3f566fea2c171c1054.zip
staging: gasket: fix gasket_free_coherent_memory metadata frees
Free gasket_coherent_page_entries metadata memory, update data structures accordingly. Signed-off-by: Nick Ewalt <nicholasewalt@google.com> Signed-off-by: Todd Poynor <toddpoynor@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gasket')
-rw-r--r--drivers/staging/gasket/gasket_page_table.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 33d98043953a..c1ce8f984f8e 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -1353,6 +1353,11 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
gasket_dev->coherent_buffer.virt_base = NULL;
gasket_dev->coherent_buffer.phys_base = 0;
}
+
+ kfree(gasket_dev->page_table[index]->coherent_pages);
+ gasket_dev->page_table[index]->coherent_pages = NULL;
+ gasket_dev->page_table[index]->num_coherent_pages = 0;
+
return 0;
}