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

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

Merge "msm: vidc: Fix video power suspend issue"

parents 3536031e 8f604715

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

+1 −10
Original line number Diff line number Diff line
@@ -3336,20 +3336,11 @@ int msm_comm_suspend(int core_id) 
	}



	mutex_lock(&core->lock);

	if (core->state != VIDC_CORE_INIT_DONE) {

		dprintk(VIDC_ERR,

				"%s - fw is not in proper state, skip suspend\n",

				__func__);

		rc = -EINVAL;

		goto exit;

	}



	rc = call_hfi_op(hdev, suspend, hdev->hfi_device_data);

	if (rc)

		dprintk(VIDC_WARN, "Failed to suspend\n");



exit:

	mutex_unlock(&core->lock);



	return rc;

}

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

+3 −1
Original line number Diff line number Diff line
@@ -1029,8 +1029,10 @@ static int venus_hfi_suspend(void *dev) 
	flush_delayed_work(&venus_hfi_pm_work);



	mutex_lock(&device->lock);

	if (device->power_enabled)

	if (device->power_enabled) {

		dprintk(VIDC_WARN, "%s: Venus is busy\n", __func__);

		rc = -EBUSY;

	}

	mutex_unlock(&device->lock);

	return rc;

}