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

Commit 5510fa23 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: Only clear references to GMU clocks when removing" into msm-4.9

parents 942ec30a 8570d513

drivers/gpu/msm/kgsl_gmu.c

+6 −2
Original line number Diff line number Diff line
@@ -1153,7 +1153,6 @@ static int gmu_disable_clks(struct gmu_device *gmu) 


	while ((j < MAX_GMU_CLKS) && gmu->clks[j]) {

		clk_disable_unprepare(gmu->clks[j]);

		gmu->clks[j] = NULL;

		j++;

	}
@@ -1351,7 +1350,7 @@ void gmu_remove(struct kgsl_device *device) 
{

	struct gmu_device *gmu = &device->gmu;

	struct kgsl_hfi *hfi = &gmu->hfi;

	int i;

	int i = 0;



	if (!device->gmu.pdev)

		return;
@@ -1360,6 +1359,11 @@ void gmu_remove(struct kgsl_device *device) 


	gmu_stop(device);



	while ((i < MAX_GMU_CLKS) && gmu->clks[i]) {

		gmu->clks[i] = NULL;

		i++;

	}



	if (gmu->gmu_interrupt_num) {

		disable_irq(gmu->gmu_interrupt_num);

		devm_free_irq(&gmu->pdev->dev,