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

Commit b2b2c1bb authored by Swathi Sridhar's avatar Swathi Sridhar
Browse files

ion: Fix ion compilation errors on Kona 



Include the following changes missed out during the merge
from msm-4.14 to msm-kona to overcome compilation issues in Kona:

1.a1bc21a0da25f8c31b0aaeb586e738522a0acbd4
(ion: Fix missing mutex_unlock on error path)

2.Address the prototype change of function of_dma_configure()

Change-Id: I7505da3ff77a1fed9a51708e54fa179ee1fb4636
Signed-off-by: default avatarSwathi Sridhar <swatsrid@codeaurora.org>
parent 2d4852d6

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);