Merge "msm: vidc: Defer suspend till Venus goes to power collapse" (5b0b2741) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/vidc/venus_hfi.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1359,12 +1359,15 @@ static int venus_hfi_suspend(void *dev)
		mutex_lock(&device->lock);

		if (device->power_enabled) {
		rc = flush_delayed_work(&venus_hfi_pm_work);
		dprintk(VIDC_INFO, "%s flush delayed work %d\n", __func__, rc);
		dprintk(VIDC_DBG, "Venus is busy\n");
		rc = -EBUSY;
		} else {
		dprintk(VIDC_DBG, "Venus is power suspended\n");
		rc = 0;
		}

		mutex_unlock(&device->lock);
		return 0;
		return rc;
		}

		static enum hal_default_properties venus_hfi_get_default_properties(void *dev)