samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: sync: Fix imports for types

Browse Source 
Fix the order of imports for to resolve cam_sync
typedef for kernel CFI.

CRs-Fixed: 2772200
Change-Id: I4e5e642e6b45412904585aaa68c0ef77fedeee2d
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
This commit is contained in:
Karthik Jayakumar
2020-09-14 14:17:53 -07:00
parent c0064beebc
commit 8f95314e74
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/cam_sync/cam_sync_private.h
View File

@@ -16,6 +16,7 @@
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
#include <media/v4l2-event.h> #include <media/v4l2-event.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include "cam_sync_api.h"
#if IS_REACHABLE(CONFIG_MSM_GLOBAL_SYNX) #if IS_REACHABLE(CONFIG_MSM_GLOBAL_SYNX)
#include <synx_api.h> #include <synx_api.h>

5
drivers/cam_sync/cam_sync_util.c
View File

@@ -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_info = container_of(cb_dispatch_work,
struct sync_callback_info, struct sync_callback_info,
cb_dispatch_work); cb_dispatch_work);
sync_callback sync_data = cb_info->callback_func;
cb_info->callback_func(cb_info->sync_obj, sync_data(cb_info->sync_obj, cb_info->status, cb_info->cb_data);
cb_info->status,
cb_info->cb_data);
kfree(cb_info); kfree(cb_info);
} }

1
drivers/cam_sync/cam_sync_util.h
View File

@@ -7,7 +7,6 @@
#define __CAM_SYNC_UTIL_H__ #define __CAM_SYNC_UTIL_H__
#include <cam_sync_api.h>
#include "cam_sync_private.h" #include "cam_sync_private.h"
#include "cam_debug_util.h" #include "cam_debug_util.h"