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

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

Merge "msm: ais: Fix CAM_WARN formatting errors"

parents 4cc56025 1c3fdc05

drivers/media/platform/msm/ais/cam_sensor_module/cam_flash/cam_flash_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		csl_packet->header.request_id <= fctrl->last_flush_req

		&& fctrl->last_flush_req != 0) {

		CAM_WARN(CAM_FLASH,

			"reject request %lld, last request to flush %lld",

			"reject request %lld, last request to flush %d",

			csl_packet->header.request_id, fctrl->last_flush_req);

		rc = -EINVAL;

		goto rel_pkt_buf;
@@ -1428,7 +1428,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		}



		if (cam_mem_put_cpu_buf(cmd_desc->mem_handle))

			CAM_WARN(CAM_FLASH, "Fail in put buffer: %pK",

			CAM_WARN(CAM_FLASH, "Fail in put buffer: %iK",

				cmd_desc->mem_handle);

		break;

	}
@@ -1727,7 +1727,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
	}



	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return 0;
@@ -1738,7 +1738,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
			cmd_desc->mem_handle);

rel_pkt_buf:

	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return rc;