Merge "msm: kgsl: Return zero from wait_for_active_transition for no GMU case"

drivers/gpu/msm/kgsl_gmu_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,5 +360,5 @@ int gmu_core_dev_wait_for_active_transition(struct kgsl_device *device)
		if (ops && ops->wait_for_active_transition)
		return ops->wait_for_active_transition(device);

		return -ETIMEDOUT;
		return 0;
		}