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

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

Merge "msm: camera: sync: Fix imports for types" into camera-kernel.lnx.4.0

parents 0219f620 8f95314e

drivers/cam_sync/cam_sync_private.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <media/v4l2-subdev.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

#include "cam_sync_api.h"



#if IS_REACHABLE(CONFIG_MSM_GLOBAL_SYNX)

#include <synx_api.h>

drivers/cam_sync/cam_sync_util.c

+2 −3
Original line number Diff line number Diff line
@@ -291,10 +291,9 @@ void cam_sync_util_cb_dispatch(struct work_struct *cb_dispatch_work) 
	struct sync_callback_info *cb_info = container_of(cb_dispatch_work,

		struct sync_callback_info,

		cb_dispatch_work);

	sync_callback sync_data = cb_info->callback_func;



	cb_info->callback_func(cb_info->sync_obj,

		cb_info->status,

		cb_info->cb_data);

	sync_data(cb_info->sync_obj, cb_info->status, cb_info->cb_data);



	kfree(cb_info);

}

drivers/cam_sync/cam_sync_util.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#define __CAM_SYNC_UTIL_H__





#include <cam_sync_api.h>

#include "cam_sync_private.h"

#include "cam_debug_util.h"