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

Commit fd68d8a8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Check for failure in coresight initialization"

parents 74f4d92d b8311c7b

drivers/gpu/msm/adreno_coresight.c

+3 −2
Original line number Diff line number Diff line
@@ -314,8 +314,9 @@ int adreno_coresight_init(struct adreno_device *adreno_dev) 


	desc.pdata = of_get_coresight_platform_data(&device->pdev->dev,

			device->pdev->dev.of_node);

	if (desc.pdata == NULL)

		return -ENODEV;

	if (IS_ERR_OR_NULL(desc.pdata))

		return (desc.pdata == NULL) ? -ENODEV :

			PTR_ERR(desc.pdata);



	desc.type = CORESIGHT_DEV_TYPE_SOURCE;

	desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_BUS;