diff mbox

i2c: designware: Fix bogus sda_hold_time due to uninitialized vars

Message ID 743ebd23-17ab-03d2-ebd9-66acc9aee417@siemens.com
State Accepted
Headers show

Commit Message

Jan Kiszka May 22, 2017, 5:46 a.m. UTC
We need to initializes those variables to 0 for platforms that do not
provide ACPI parameters. Otherwise, we set sda_hold_time to random
values, breaking e.g. Galileo and IOT2000 boards.

Fixes: 9d6408433019 ("i2c: designware: don't infer timings described by ACPI from clock rate")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Affects 4.12-rc2.

 drivers/i2c/busses/i2c-designware-platdrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Ard Biesheuvel May 22, 2017, 6:02 a.m. UTC | #1
> On 22 May 2017, at 07:46, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> 
> We need to initializes those variables to 0 for platforms that do not
> provide ACPI parameters. Otherwise, we set sda_hold_time to random
> values, breaking e.g. Galileo and IOT2000 boards.
> 
> Fixes: 9d6408433019 ("i2c: designware: don't infer timings described by ACPI from clock rate")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
> 
> Affects 4.12-rc2.
> 
> drivers/i2c/busses/i2c-designware-platdrv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 6283b99d2b17..d1263b82d646 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -94,9 +94,9 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[],
> static int dw_i2c_acpi_configure(struct platform_device *pdev)
> {
>    struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
> +    u32 ss_ht = 0, fp_ht = 0, hs_ht = 0, fs_ht = 0;
>    acpi_handle handle = ACPI_HANDLE(&pdev->dev);
>    const struct acpi_device_id *id;
> -    u32 ss_ht, fp_ht, hs_ht, fs_ht;
>    struct acpi_device *adev;
>    const char *uid;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jarkko Nikula May 22, 2017, 6:37 a.m. UTC | #2
On 05/22/2017 08:46 AM, Jan Kiszka wrote:
> We need to initializes those variables to 0 for platforms that do not
> provide ACPI parameters. Otherwise, we set sda_hold_time to random
> values, breaking e.g. Galileo and IOT2000 boards.
>
> Fixes: 9d6408433019 ("i2c: designware: don't infer timings described by ACPI from clock rate")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Affects 4.12-rc2.
>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wolfram Sang May 22, 2017, 8:36 a.m. UTC | #3
On Mon, May 22, 2017 at 07:46:55AM +0200, Jan Kiszka wrote:
> We need to initializes those variables to 0 for platforms that do not
> provide ACPI parameters. Otherwise, we set sda_hold_time to random
> values, breaking e.g. Galileo and IOT2000 boards.
> 
> Fixes: 9d6408433019 ("i2c: designware: don't infer timings described by ACPI from clock rate")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to for-current, thanks!
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 6283b99d2b17..d1263b82d646 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -94,9 +94,9 @@  static void dw_i2c_acpi_params(struct platform_device *pdev, char method[],
 static int dw_i2c_acpi_configure(struct platform_device *pdev)
 {
 	struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
+	u32 ss_ht = 0, fp_ht = 0, hs_ht = 0, fs_ht = 0;
 	acpi_handle handle = ACPI_HANDLE(&pdev->dev);
 	const struct acpi_device_id *id;
-	u32 ss_ht, fp_ht, hs_ht, fs_ht;
 	struct acpi_device *adev;
 	const char *uid;