A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: camera: smmu: Fixes label_is_string warning in camera dtsi files

Browse source 
Property 'label' is a reserved property of type string. At present,
device trees use the property as list of strings.

Rename the property to 'cam-smmu-label' to resolve conflict.

CRs-Fixed: 2729703
Change-Id: I8bfb3af4daeaad4cc9dfc633a0256186ba1416c9
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
This commit is contained in:
Anand Ravi 2020-07-16 13:16:52 -07:00
commit e45fa615bf
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/cam_smmu/cam_smmu_api.c
View file

@ -3864,7 +3864,7 @@ static int cam_populate_smmu_context_banks(struct device *dev,
of_property_read_bool(dev->of_node, "multiple-client-devices");
cb->num_shared_hdl = of_property_count_strings(dev->of_node,
"label");
"cam-smmu-label");
if (cb->num_shared_hdl >
CAM_SMMU_SHARED_HDL_MAX) {
@ -3877,7 +3877,7 @@ static int cam_populate_smmu_context_banks(struct device *dev,
/* set the name of the context bank */
for (i = 0; i < cb->num_shared_hdl; i++)
rc = of_property_read_string_index(dev->of_node,
"label", i, &cb->name[i]);
"cam-smmu-label", i, &cb->name[i]);
if (rc < 0) {
CAM_ERR(CAM_SMMU,
"Error: failed to read label from sub device");