Commit 8e3ecc68 authored by Liu Shixin's avatar Liu Shixin Committed by Rafael J. Wysocki

ACPI: LPSS: Use kstrtol() instead of simple_strtol()

The simple_strtol() function is not reliable in some situation, since
it does not check for the range overflow. Use kstrtol() instead.

While at it, modify the code to avoid evaluating _SEM unnecessarily
if uid_str is NULL or kstrtol() fails to convert that string to a
nonzero number.
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
[ rjw: Check uid right after calling kstrtol() ]
[ rjw: Rewrite subject and changelog ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 614124be
...@@ -186,13 +186,12 @@ static void byt_i2c_setup(struct lpss_private_data *pdata) ...@@ -186,13 +186,12 @@ static void byt_i2c_setup(struct lpss_private_data *pdata)
long uid = 0; long uid = 0;
/* Expected to always be true, but better safe then sorry */ /* Expected to always be true, but better safe then sorry */
if (uid_str) if (uid_str && !kstrtol(uid_str, 10, &uid) && uid) {
uid = simple_strtol(uid_str, NULL, 10); /* Detect I2C bus shared with PUNIT and ignore its d3 status */
status = acpi_evaluate_integer(handle, "_SEM", NULL, &shared_host);
/* Detect I2C bus shared with PUNIT and ignore its d3 status */ if (ACPI_SUCCESS(status) && shared_host)
status = acpi_evaluate_integer(handle, "_SEM", NULL, &shared_host); pmc_atom_d3_mask &= ~(BIT_LPSS2_F1_I2C1 << (uid - 1));
if (ACPI_SUCCESS(status) && shared_host && uid) }
pmc_atom_d3_mask &= ~(BIT_LPSS2_F1_I2C1 << (uid - 1));
lpss_deassert_reset(pdata); lpss_deassert_reset(pdata);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment