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

Commit aea646dc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cvp: Rename cvpss to evass"

parents e6c44b09 1d2edff2

drivers/media/platform/msm/cvp/cvp_hfi.c

+1 −1
Original line number Diff line number Diff line
@@ -4295,7 +4295,7 @@ static int __load_fw(struct iris_hfi_device *device) 
			|| device->res->use_non_secure_pil) {

		if (!device->resources.fw.cookie)

			device->resources.fw.cookie =

				subsystem_get_with_fwname("cvpss",

				subsystem_get_with_fwname("evass",

				device->res->fw_name);



		if (IS_ERR_OR_NULL(device->resources.fw.cookie)) {

drivers/media/platform/msm/cvp/msm_cvp_common.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
	unsigned long flags = 0;

	enum cvp_core_state cur_state;



	subsystem_crashed("cvpss");

	subsystem_crashed("evass");

	if (!response) {

		dprintk(CVP_ERR,

			"Failed to get valid response for sys error\n");

drivers/media/platform/msm/cvp/msm_cvp_res_parse.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ int cvp_read_platform_resources_from_drv_data( 


	res->sku_version = platform_data->sku_version;



	res->fw_name = "cvpss";

	res->fw_name = "evass";



	dprintk(CVP_CORE, "Firmware filename: %s\n", res->fw_name);