Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1247715

Re: [PATCH v2 1/4] i2c: designware-platdrv: enable RuntimePM before registering to the core

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Fri, Oct 09, 2015 at 10:39:24AM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> The core may register clients attached to this master which may use
> funtionality from the master. So, RuntimePM must be enabled before, otherwise
> this will fail.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

No feedback here, but for the other two drivers the same principle was
acked. CCing Mika, just in case.

Applied to for-current, thanks!

> ---
>  drivers/i2c/busses/i2c-designware-platdrv.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 3dd2de31a2f8d3..73d58415bbc100 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -253,12 +253,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
>  	adap->dev.parent = &pdev->dev;
>  	adap->dev.of_node = pdev->dev.of_node;
>  
> -	r = i2c_add_numbered_adapter(adap);
> -	if (r) {
> -		dev_err(&pdev->dev, "failure adding adapter\n");
> -		return r;
> -	}
> -
>  	if (dev->pm_runtime_disabled) {
>  		pm_runtime_forbid(&pdev->dev);
>  	} else {
> @@ -268,6 +262,13 @@ static int dw_i2c_probe(struct platform_device *pdev)
>  		pm_runtime_enable(&pdev->dev);
>  	}
>  
> +	r = i2c_add_numbered_adapter(adap);
> +	if (r) {
> +		dev_err(&pdev->dev, "failure adding adapter\n");
> +		pm_runtime_disable(&pdev->dev);
> +		return r;
> +	}
> +
>  	return 0;
>  }
>  
> -- 
> 2.1.4
> 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/4] i2c: designware-platdrv: enable RuntimePM before registering to the core Wolfram Sang <wsa@the-dreams.de> - 2015-10-09 11:50 +0200
  Re: [PATCH v2 1/4] i2c: designware-platdrv: enable RuntimePM before  registering to the core Wolfram Sang <wsa@the-dreams.de> - 2015-10-15 13:50 +0200
    Re: [PATCH v2 1/4] i2c: designware-platdrv: enable RuntimePM before  registering to the core Mika Westerberg <mika.westerberg@linux.intel.com> - 2015-10-15 14:30 +0200

csiph-web