Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a07ada authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: Fix ion compilation errors on Kona"

parents b96fd32e b2b2c1bb

drivers/staging/android/ion/ion.c

+3 −1
Original line number Diff line number Diff line
@@ -354,8 +354,10 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment, 
					 map_attrs);

	}



	if (count <= 0)

	if (count <= 0) {

		mutex_unlock(&buffer->lock);

		return ERR_PTR(-ENOMEM);

	}



	a->dma_mapped = true;

	mutex_unlock(&buffer->lock);

drivers/staging/android/ion/msm/msm_ion_of.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static struct ion_platform_data *msm_ion_parse_dt(struct platform_device *pdev) 
			pr_err("Failed to create device %s\n", node->name);

			goto free_heaps;

		}

		of_dma_configure(&new_dev->dev, node);

		of_dma_configure(&new_dev->dev, node, true);



		pdata->heaps[idx].priv = &new_dev->dev;

		val = of_get_address(node, 0, NULL, NULL);