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

Commit c1c1c9fb authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: cci: Fix incorrect use of cci config ioctl" into camera-kernel.lnx.3.1

parents f47f54b5 76d1c90e

drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

+2 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include "cam_cci_dev.h"
@@ -403,8 +403,7 @@ static int cam_cci_platform_probe(struct platform_device *pdev) 
		sizeof(new_cci_dev->device_name));

	new_cci_dev->v4l2_dev_str.name =

		new_cci_dev->device_name;

	new_cci_dev->v4l2_dev_str.sd_flags =

		(V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS);

	new_cci_dev->v4l2_dev_str.sd_flags = V4L2_SUBDEV_FL_HAS_EVENTS;

	new_cci_dev->v4l2_dev_str.ent_function =

		CAM_CCI_DEVICE_TYPE;

	new_cci_dev->v4l2_dev_str.token =

drivers/cam_sensor_module/cam_cci/cam_cci_dev.h

+1 −1
Original line number Diff line number Diff line
@@ -304,6 +304,6 @@ irqreturn_t cam_cci_irq(int irq_num, void *data); 
struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index);



#define VIDIOC_MSM_CCI_CFG \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct cam_cci_ctrl *)

	_IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct cam_cci_ctrl)



#endif /* _CAM_CCI_DEV_H_ */