Merge "msm: camera: Changes to accommodate 32-bit Arch" (8cc12dfb) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@ int32_t cam_csiphy_core_cfg(void *phy_dev,
		int32_t offset, rc = 0;
		struct cam_start_stop_dev_cmd config;

		rc = copy_from_user(&config, (void __user *)cmd->handle,
		rc = copy_from_user(&config, u64_to_user_ptr(cmd->handle),
		sizeof(config));
		if (rc < 0) {
		CAM_ERR(CAM_CSIPHY, "Failed copying from User");
		@@ -758,7 +758,7 @@ int32_t cam_csiphy_core_cfg(void *phy_dev,
		struct cam_start_stop_dev_cmd config;
		int32_t offset;

		rc = copy_from_user(&config, (void __user *)cmd->handle,
		rc = copy_from_user(&config, u64_to_user_ptr(cmd->handle),
		sizeof(config));
		if (rc < 0) {
		CAM_ERR(CAM_CSIPHY, "Failed copying from User");

+3 −2

Original line number	Diff line number	Diff line
		@@ -907,7 +907,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		/* getting CSL Packet */
		ioctl_ctrl = (struct cam_control *)arg;

		if (copy_from_user((&config), (void __user *) ioctl_ctrl->handle,
		if (copy_from_user((&config), u64_to_user_ptr(ioctl_ctrl->handle),
		sizeof(config))) {
		CAM_ERR(CAM_FLASH, "Copy cmd handle from user failed");
		return -EFAULT;
		@@ -928,7 +928,8 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		}

		/* Add offset to the flash csl header */
		csl_packet = (struct cam_packet *)(generic_ptr + config.offset);
		csl_packet = (struct cam_packet *)(uintptr_t)(generic_ptr +
		config.offset);
		switch (csl_packet->header.op_code & 0xFFFFFF) {
		case CAM_FLASH_PACKET_OPCODE_INIT: {
		/* INIT packet*/