diff mbox

i2c: rk3x: populate correct variable for sda_falling_time

Message ID 1448467098-10198-1-git-send-email-wsa@the-dreams.de (mailing list archive)
State New, archived
Headers show

Commit Message

Wolfram Sang Nov. 25, 2015, 3:58 p.m. UTC
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 drivers/i2c/busses/i2c-rk3x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Doug Anderson Nov. 25, 2015, 4:08 p.m. UTC | #1
Wolfram,

On Wed, Nov 25, 2015 at 7:58 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
>  drivers/i2c/busses/i2c-rk3x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
> index c1935ebd6a9c38..9096d17beb5bb0 100644
> --- a/drivers/i2c/busses/i2c-rk3x.c
> +++ b/drivers/i2c/busses/i2c-rk3x.c
> @@ -908,7 +908,7 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
>                                  &i2c->scl_fall_ns))
>                 i2c->scl_fall_ns = 300;
>         if (of_property_read_u32(pdev->dev.of_node, "i2c-sda-falling-time-ns",
> -                                &i2c->scl_fall_ns))
> +                                &i2c->sda_fall_ns))
>                 i2c->sda_fall_ns = i2c->scl_fall_ns;
>
>         strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));

Thanks for the fix!  In my dts files I never specified
"i2c-sda-falling-time-ns" (since realistically SDA and SCL nearly
always fall with the same rate) so I never saw the issue.  ...but it's
definitely a good idea to fix.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Wolfram Sang Nov. 30, 2015, 1:27 p.m. UTC | #2
On Wed, Nov 25, 2015 at 04:58:18PM +0100, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Applied to for-current, thanks!
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index c1935ebd6a9c38..9096d17beb5bb0 100644
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -908,7 +908,7 @@  static int rk3x_i2c_probe(struct platform_device *pdev)
 				 &i2c->scl_fall_ns))
 		i2c->scl_fall_ns = 300;
 	if (of_property_read_u32(pdev->dev.of_node, "i2c-sda-falling-time-ns",
-				 &i2c->scl_fall_ns))
+				 &i2c->sda_fall_ns))
 		i2c->sda_fall_ns = i2c->scl_fall_ns;
 
 	strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));