android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dma-heap: qcom: Remove extraneous struct dma_heap reference"

Browse Source
This commit is contained in:
qctecmdr 2021-05-14 00:51:47 -07:00 committed by Gerrit - the friendly Code Review server
commit 3dea89c27b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma-buf/heaps/qcom_cma_heap.c
View File

@ -28,7 +28,6 @@
#include "qcom_sg_ops.h"
struct cma_heap {
struct dma_heap *heap;
struct cma *cma;
/* max_align is in units of page_order, similar to CONFIG_CMA_ALIGNMENT */
u32 max_align;
@ -148,6 +147,7 @@ static int __add_cma_heap(struct platform_heap *heap_data, void *data)
{
struct cma_heap *cma_heap;
struct dma_heap_export_info exp_info;
struct dma_heap *heap;
cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
if (!cma_heap)
@ -161,9 +161,9 @@ static int __add_cma_heap(struct platform_heap *heap_data, void *data)
exp_info.ops = &cma_heap_ops;
exp_info.priv = cma_heap;
cma_heap->heap = dma_heap_add(&exp_info);
if (IS_ERR(cma_heap->heap)) {
int ret = PTR_ERR(cma_heap->heap);
heap = dma_heap_add(&exp_info);
if (IS_ERR(heap)) {
int ret = PTR_ERR(heap);
kfree(cma_heap);
return ret;