mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
112 lines
3.9 KiB
Diff
112 lines
3.9 KiB
Diff
From 27f7b3b3059f6181e2786f886f4cd92f413bc30c Mon Sep 17 00:00:00 2001
|
|
From: Shalini Krishnamoorthi <shakri@codeaurora.org>
|
|
Date: Thu, 30 Jun 2016 14:00:04 -0700
|
|
Subject: msm: mdss: Correct the format specifiers in sscanf function
|
|
|
|
In many parts of the code the sscanf function was getting
|
|
an unsigned integer with a wrong format specifier. Changed
|
|
the format specifiers appropriately. Single variable sscanf
|
|
were replaced by kstrtouint at reported places.
|
|
|
|
CRs-Fixed: 1024872
|
|
Change-Id: I03ce718b0456d437d31d701586965d0aa7443b51
|
|
Signed-off-by: Shalini Krishnamoorthi <shakri@codeaurora.org>
|
|
---
|
|
drivers/video/msm/mdss/mdss_debug.c | 8 ++++----
|
|
drivers/video/msm/mdss/mdss_fb.c | 8 ++++----
|
|
drivers/video/msm/mdss/mdss_mdp.c | 2 +-
|
|
drivers/video/msm/mdss/mdss_mdp_overlay.c | 2 +-
|
|
4 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/video/msm/mdss/mdss_debug.c b/drivers/video/msm/mdss/mdss_debug.c
|
|
index 21c2394..861d70f 100644
|
|
--- a/drivers/video/msm/mdss/mdss_debug.c
|
|
+++ b/drivers/video/msm/mdss/mdss_debug.c
|
|
@@ -81,7 +81,7 @@ static ssize_t panel_debug_base_offset_write(struct file *file,
|
|
|
|
buf[count] = 0; /* end of string */
|
|
|
|
- if (sscanf(buf, "%x %d", &off, &cnt) != 2)
|
|
+ if (sscanf(buf, "%x %u", &off, &cnt) != 2)
|
|
return -EFAULT;
|
|
|
|
if (off > dbg->max_offset)
|
|
@@ -735,11 +735,11 @@ static ssize_t mdss_debug_factor_write(struct file *file,
|
|
|
|
if (strnchr(buf, count, '/')) {
|
|
/* Parsing buf as fraction */
|
|
- if (sscanf(buf, "%d/%d", &numer, &denom) != 2)
|
|
+ if (sscanf(buf, "%u/%u", &numer, &denom) != 2)
|
|
return -EFAULT;
|
|
} else {
|
|
/* Parsing buf as percentage */
|
|
- if (sscanf(buf, "%d", &numer) != 1)
|
|
+ if (kstrtouint(buf, 0, &numer))
|
|
return -EFAULT;
|
|
denom = 100;
|
|
}
|
|
@@ -1047,7 +1047,7 @@ static ssize_t mdss_debug_perf_bw_limit_write(struct file *file,
|
|
|
|
if (strnchr(buf, count, ' ')) {
|
|
/* Parsing buf */
|
|
- if (sscanf(buf, "%d %d", &mode, &val) != 2)
|
|
+ if (sscanf(buf, "%u %u", &mode, &val) != 2)
|
|
return -EFAULT;
|
|
}
|
|
|
|
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
|
|
index dc2e318..624b344 100644
|
|
--- a/drivers/video/msm/mdss/mdss_fb.c
|
|
+++ b/drivers/video/msm/mdss/mdss_fb.c
|
|
@@ -600,8 +600,8 @@ static ssize_t mdss_fb_force_panel_dead(struct device *dev,
|
|
return len;
|
|
}
|
|
|
|
- if (sscanf(buf, "%d", &pdata->panel_info.panel_force_dead) != 1)
|
|
- pr_err("sccanf buf error!\n");
|
|
+ if (kstrtouint(buf, 0, &pdata->panel_info.panel_force_dead))
|
|
+ pr_err("kstrtouint buf error!\n");
|
|
|
|
return len;
|
|
}
|
|
@@ -714,8 +714,8 @@ static ssize_t mdss_fb_change_dfps_mode(struct device *dev,
|
|
}
|
|
pinfo = &pdata->panel_info;
|
|
|
|
- if (sscanf(buf, "%d", &dfps_mode) != 1) {
|
|
- pr_err("sccanf buf error!\n");
|
|
+ if (kstrtouint(buf, 0, &dfps_mode)) {
|
|
+ pr_err("kstrtouint buf error!\n");
|
|
return len;
|
|
}
|
|
|
|
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
|
|
index e2697ca..7bfbdda 100644
|
|
--- a/drivers/video/msm/mdss/mdss_mdp.c
|
|
+++ b/drivers/video/msm/mdss/mdss_mdp.c
|
|
@@ -2448,7 +2448,7 @@ static ssize_t mdss_mdp_store_max_limit_bw(struct device *dev,
|
|
struct mdss_data_type *mdata = dev_get_drvdata(dev);
|
|
u32 data = 0;
|
|
|
|
- if (1 != sscanf(buf, "%d", &data)) {
|
|
+ if (kstrtouint(buf, 0, &data)) {
|
|
pr_info("Not able scan to bw_mode_bitmap\n");
|
|
} else {
|
|
mdata->bw_mode_bitmap = data;
|
|
diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
|
index 7e2325f..74cb38e 100644
|
|
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
|
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
|
@@ -2973,7 +2973,7 @@ static ssize_t dynamic_fps_sysfs_wta_dfps(struct device *dev,
|
|
|
|
if (pdata->panel_info.dfps_update ==
|
|
DFPS_IMMEDIATE_MULTI_UPDATE_MODE_CLK_HFP) {
|
|
- if (sscanf(buf, "%d %d %d %d %d",
|
|
+ if (sscanf(buf, "%u %u %u %u %u",
|
|
&data.hfp, &data.hbp, &data.hpw,
|
|
&data.clk_rate, &data.fps) != 5) {
|
|
pr_err("could not read input\n");
|
|
--
|
|
cgit v1.1
|
|
|