summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaitik Bharadiya <bharad@codeaurora.org>2019-11-05 11:35:09 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2020-04-28 04:27:15 -0700
commitfcce82ebdf6c8ca68c0277ffa828487c52e8d895 (patch)
treeeb30a240f1c61f887629754395c30fed7b7e7a18
parentb790ab7e1e81b5ccb8e3889aaa097933778b635b (diff)
soc: qcom: Fix strlcpy compilation error with clang
Replace size of source with size of the destination in strlcpy size argument to fix clang compilation error. Change-Id: Ia05e562b1524995b1aa98d934bcfa4d2c5642b70 Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org> Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
-rw-r--r--drivers/soc/qcom/rpm_master_stat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qcom/rpm_master_stat.c b/drivers/soc/qcom/rpm_master_stat.c
index b8bf3a059677..a53af5344490 100644
--- a/drivers/soc/qcom/rpm_master_stat.c
+++ b/drivers/soc/qcom/rpm_master_stat.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2017, 2020, The Linux Foundation. All rights reserved.
*
* 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
@@ -351,7 +351,7 @@ static struct msm_rpm_master_stats_platform_data
{
struct msm_rpm_master_stats_platform_data *pdata;
struct device_node *node = dev->of_node;
- int rc = 0, i;
+ int rc = 0, i, rpm_master_name_len = 0;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
@@ -387,7 +387,7 @@ static struct msm_rpm_master_stats_platform_data
* Read master names from DT
*/
for (i = 0; i < pdata->num_masters; i++) {
- const char *master_name;
+ const char *master_name = NULL;
of_property_read_string_index(node, "qcom,masters",
i, &master_name);
@@ -395,9 +395,9 @@ static struct msm_rpm_master_stats_platform_data
strlen(master_name) + 1, GFP_KERNEL);
if (!pdata->masters[i])
goto err;
-
+ rpm_master_name_len = strlen(master_name);
strlcpy(pdata->masters[i], master_name,
- strlen(master_name) + 1);
+ rpm_master_name_len + 1);
}
return pdata;
err: