evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "media: camera: Fix Major and Minor number"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-08 18:28:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit b0dc81a983
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -25,8 +25,8 @@
#define MSM_CAMERA_TZ_BOOT_PROTECTED (false) #define MSM_CAMERA_TZ_BOOT_PROTECTED (false)
/* Update version major number in case the HLOS-TA interface is changed*/ /* Update version major number in case the HLOS-TA interface is changed*/
#define TA_IF_VERSION_MAJ 1 #define TA_IF_VERSION_MAJ 2
#define TA_IF_VERSION_MIN 2 #define TA_IF_VERSION_MIN 1
#undef CDBG #undef CDBG
#ifdef MSM_CAMERA_TZ_UTIL_VERBOSE #ifdef MSM_CAMERA_TZ_UTIL_VERBOSE

4
drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -29,7 +29,7 @@
#define MSM_CAMERA_TZ_HW_BLOCK_CPP 0x0000000010 #define MSM_CAMERA_TZ_HW_BLOCK_CPP 0x0000000010
enum msm_camera_tz_cmd_id_t { enum msm_camera_tz_cmd_id_t {
MSM_CAMERA_TZ_CMD_NONE, MSM_CAMERA_TZ_CMD_NONE = 56000,
MSM_CAMERA_TZ_CMD_GET_IF_VERSION, MSM_CAMERA_TZ_CMD_GET_IF_VERSION,
MSM_CAMERA_TZ_CMD_POWER_UP, MSM_CAMERA_TZ_CMD_POWER_UP,
MSM_CAMERA_TZ_CMD_POWER_DOWN, MSM_CAMERA_TZ_CMD_POWER_DOWN,