All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: Chen-Yu Tsai <wens@csie.org>
Cc: Wolfram Sang <wsa@the-dreams.de>,
	linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	linux-i2c@vger.kernel.org,
	Gregory CLEMENT <gregory.clement@free-electrons.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] i2c: mv64xxx: continue probe when clock-frequency is missing
Date: Mon, 25 Aug 2014 18:41:24 +0200	[thread overview]
Message-ID: <20140825164124.GA22771@lunn.ch> (raw)
In-Reply-To: <1408981819-3477-1-git-send-email-wens@csie.org>

On Mon, Aug 25, 2014 at 11:50:19PM +0800, Chen-Yu Tsai wrote:
> The "clock-frequency" DT property is listed as optional, However,
> the current code stores the return value of of_property_read_u32 in
> the return code of mv64xxx_of_config, but then forgets to clear it
> after setting the default value of "clock-frequency". It is then
> passed out to the main probe function, resulting in a probe failure
> when "clock-frequency" is missing.
> 
> This patch checks and then throws away the result of
> of_property_read_u32, instead of storing it and having to clear it
> afterwards.
> 
> This issue was discovered after the property was removed from all
> sunxi DTs.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Cc: stable@vger.kernel.org

It would be good to add

Fixes: 4c730a06c19bb ("i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided")

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew


> ---
>  drivers/i2c/busses/i2c-mv64xxx.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index 6dc5ded..2f64273 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
>  	}
>  	tclk = clk_get_rate(drv_data->clk);
>  
> -	rc = of_property_read_u32(np, "clock-frequency", &bus_freq);
> -	if (rc)
> +	if (of_property_read_u32(np, "clock-frequency", &bus_freq))
>  		bus_freq = 100000; /* 100kHz by default */
>  
>  	if (!mv64xxx_find_baud_factors(bus_freq, tclk,
> -- 
> 2.1.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] i2c: mv64xxx: continue probe when clock-frequency is missing
Date: Mon, 25 Aug 2014 18:41:24 +0200	[thread overview]
Message-ID: <20140825164124.GA22771@lunn.ch> (raw)
In-Reply-To: <1408981819-3477-1-git-send-email-wens@csie.org>

On Mon, Aug 25, 2014 at 11:50:19PM +0800, Chen-Yu Tsai wrote:
> The "clock-frequency" DT property is listed as optional, However,
> the current code stores the return value of of_property_read_u32 in
> the return code of mv64xxx_of_config, but then forgets to clear it
> after setting the default value of "clock-frequency". It is then
> passed out to the main probe function, resulting in a probe failure
> when "clock-frequency" is missing.
> 
> This patch checks and then throws away the result of
> of_property_read_u32, instead of storing it and having to clear it
> afterwards.
> 
> This issue was discovered after the property was removed from all
> sunxi DTs.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Cc: stable at vger.kernel.org

It would be good to add

Fixes: 4c730a06c19bb ("i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided")

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew


> ---
>  drivers/i2c/busses/i2c-mv64xxx.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index 6dc5ded..2f64273 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
>  	}
>  	tclk = clk_get_rate(drv_data->clk);
>  
> -	rc = of_property_read_u32(np, "clock-frequency", &bus_freq);
> -	if (rc)
> +	if (of_property_read_u32(np, "clock-frequency", &bus_freq))
>  		bus_freq = 100000; /* 100kHz by default */
>  
>  	if (!mv64xxx_find_baud_factors(bus_freq, tclk,
> -- 
> 2.1.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2014-08-25 16:41 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-25 15:50 [PATCH] i2c: mv64xxx: continue probe when clock-frequency is missing Chen-Yu Tsai
2014-08-25 15:50 ` Chen-Yu Tsai
2014-08-25 16:10 ` Maxime Ripard
2014-08-25 16:10   ` Maxime Ripard
2014-08-25 16:41 ` Andrew Lunn [this message]
2014-08-25 16:41   ` Andrew Lunn
  -- strict thread matches above, loose matches on Subject: below --
2015-04-16 19:00 Antony Pavlov
2015-04-17  5:29 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140825164124.GA22771@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=gregory.clement@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=stable@vger.kernel.org \
    --cc=wens@csie.org \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.