All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-04-03  6:33 ` Miaoqian Lin
  0 siblings, 0 replies; 10+ messages in thread
From: Miaoqian Lin @ 2022-04-03  6:33 UTC (permalink / raw)
  To: Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Wolfram Sang,
	Stefan Wahren, Miaoqian Lin, Eric Anholt, Lad Prabhakar,
	Annaliese McDermond, linux-i2c, linux-rpi-kernel,
	linux-arm-kernel, linux-kernel

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
it should be balanced with call to clk_rate_exclusive_put().
, as already done in the remove function.

Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 5149454eef4a..d794448866a7 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(i2c_dev->bus_clk);
 	if (ret) {
 		dev_err(&pdev->dev, "Couldn't prepare clock");
-		return ret;
+		goto err_put_clk;
 	}
 
 	i2c_dev->irq = platform_get_irq(pdev, 0);
-	if (i2c_dev->irq < 0)
-		return i2c_dev->irq;
+	if (i2c_dev->irq < 0) {
+		ret =  i2c_dev->irq;
+		goto err_disable_clk;
+	}
 
 	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
 			  dev_name(&pdev->dev), i2c_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not request IRQ\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_disable_clk;
 	}
 
 	adap = &i2c_dev->adapter;
@@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 
 	ret = i2c_add_adapter(adap);
 	if (ret)
-		free_irq(i2c_dev->irq, i2c_dev);
+		goto err_free_irq;
+
+	return ret;
 
+err_free_irq:
+	free_irq(i2c_dev->irq, i2c_dev);
+err_disable_clk:
+	clk_disable_unprepare(i2c_dev->bus_clk);
+err_put_clk:
+	clk_rate_exclusive_put(i2c_dev->bus_clk);
 	return ret;
 }
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-04-03  6:33 ` Miaoqian Lin
  0 siblings, 0 replies; 10+ messages in thread
From: Miaoqian Lin @ 2022-04-03  6:33 UTC (permalink / raw)
  To: Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Wolfram Sang,
	Stefan Wahren, Miaoqian Lin, Eric Anholt, Lad Prabhakar,
	Annaliese McDermond, linux-i2c, linux-rpi-kernel,
	linux-arm-kernel, linux-kernel

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
it should be balanced with call to clk_rate_exclusive_put().
, as already done in the remove function.

Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 5149454eef4a..d794448866a7 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(i2c_dev->bus_clk);
 	if (ret) {
 		dev_err(&pdev->dev, "Couldn't prepare clock");
-		return ret;
+		goto err_put_clk;
 	}
 
 	i2c_dev->irq = platform_get_irq(pdev, 0);
-	if (i2c_dev->irq < 0)
-		return i2c_dev->irq;
+	if (i2c_dev->irq < 0) {
+		ret =  i2c_dev->irq;
+		goto err_disable_clk;
+	}
 
 	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
 			  dev_name(&pdev->dev), i2c_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not request IRQ\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_disable_clk;
 	}
 
 	adap = &i2c_dev->adapter;
@@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 
 	ret = i2c_add_adapter(adap);
 	if (ret)
-		free_irq(i2c_dev->irq, i2c_dev);
+		goto err_free_irq;
+
+	return ret;
 
+err_free_irq:
+	free_irq(i2c_dev->irq, i2c_dev);
+err_disable_clk:
+	clk_disable_unprepare(i2c_dev->bus_clk);
+err_put_clk:
+	clk_rate_exclusive_put(i2c_dev->bus_clk);
 	return ret;
 }
 
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
  2022-04-03  6:33 ` Miaoqian Lin
@ 2022-05-21 11:46   ` Wolfram Sang
  -1 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2022-05-21 11:46 UTC (permalink / raw)
  To: Miaoqian Lin
  Cc: Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Stefan Wahren,
	Eric Anholt, Lad Prabhakar, Annaliese McDermond, linux-i2c,
	linux-rpi-kernel, linux-arm-kernel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2091 bytes --]

On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
> In the error handling path, the clk_prepare_enable() function
> call should be balanced by a corresponding 'clk_disable_unprepare()'
> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
> it should be balanced with call to clk_rate_exclusive_put().
> , as already done in the remove function.
> 
> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

Looking for a reviewer here, pretty please?

> ---
>  drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>  1 file changed, 16 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
> index 5149454eef4a..d794448866a7 100644
> --- a/drivers/i2c/busses/i2c-bcm2835.c
> +++ b/drivers/i2c/busses/i2c-bcm2835.c
> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>  	ret = clk_prepare_enable(i2c_dev->bus_clk);
>  	if (ret) {
>  		dev_err(&pdev->dev, "Couldn't prepare clock");
> -		return ret;
> +		goto err_put_clk;
>  	}
>  
>  	i2c_dev->irq = platform_get_irq(pdev, 0);
> -	if (i2c_dev->irq < 0)
> -		return i2c_dev->irq;
> +	if (i2c_dev->irq < 0) {
> +		ret =  i2c_dev->irq;
> +		goto err_disable_clk;
> +	}
>  
>  	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>  			  dev_name(&pdev->dev), i2c_dev);
>  	if (ret) {
>  		dev_err(&pdev->dev, "Could not request IRQ\n");
> -		return -ENODEV;
> +		ret = -ENODEV;
> +		goto err_disable_clk;
>  	}
>  
>  	adap = &i2c_dev->adapter;
> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>  
>  	ret = i2c_add_adapter(adap);
>  	if (ret)
> -		free_irq(i2c_dev->irq, i2c_dev);
> +		goto err_free_irq;
> +
> +	return ret;
>  
> +err_free_irq:
> +	free_irq(i2c_dev->irq, i2c_dev);
> +err_disable_clk:
> +	clk_disable_unprepare(i2c_dev->bus_clk);
> +err_put_clk:
> +	clk_rate_exclusive_put(i2c_dev->bus_clk);
>  	return ret;
>  }
>  
> -- 
> 2.17.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-05-21 11:46   ` Wolfram Sang
  0 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2022-05-21 11:46 UTC (permalink / raw)
  To: Miaoqian Lin
  Cc: Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Stefan Wahren,
	Eric Anholt, Lad Prabhakar, Annaliese McDermond, linux-i2c,
	linux-rpi-kernel, linux-arm-kernel, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 2091 bytes --]

On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
> In the error handling path, the clk_prepare_enable() function
> call should be balanced by a corresponding 'clk_disable_unprepare()'
> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
> it should be balanced with call to clk_rate_exclusive_put().
> , as already done in the remove function.
> 
> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

Looking for a reviewer here, pretty please?

> ---
>  drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>  1 file changed, 16 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
> index 5149454eef4a..d794448866a7 100644
> --- a/drivers/i2c/busses/i2c-bcm2835.c
> +++ b/drivers/i2c/busses/i2c-bcm2835.c
> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>  	ret = clk_prepare_enable(i2c_dev->bus_clk);
>  	if (ret) {
>  		dev_err(&pdev->dev, "Couldn't prepare clock");
> -		return ret;
> +		goto err_put_clk;
>  	}
>  
>  	i2c_dev->irq = platform_get_irq(pdev, 0);
> -	if (i2c_dev->irq < 0)
> -		return i2c_dev->irq;
> +	if (i2c_dev->irq < 0) {
> +		ret =  i2c_dev->irq;
> +		goto err_disable_clk;
> +	}
>  
>  	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>  			  dev_name(&pdev->dev), i2c_dev);
>  	if (ret) {
>  		dev_err(&pdev->dev, "Could not request IRQ\n");
> -		return -ENODEV;
> +		ret = -ENODEV;
> +		goto err_disable_clk;
>  	}
>  
>  	adap = &i2c_dev->adapter;
> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>  
>  	ret = i2c_add_adapter(adap);
>  	if (ret)
> -		free_irq(i2c_dev->irq, i2c_dev);
> +		goto err_free_irq;
> +
> +	return ret;
>  
> +err_free_irq:
> +	free_irq(i2c_dev->irq, i2c_dev);
> +err_disable_clk:
> +	clk_disable_unprepare(i2c_dev->bus_clk);
> +err_put_clk:
> +	clk_rate_exclusive_put(i2c_dev->bus_clk);
>  	return ret;
>  }
>  
> -- 
> 2.17.1
> 

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
  2022-05-21 11:46   ` Wolfram Sang
@ 2022-05-21 12:28     ` Christophe JAILLET
  -1 siblings, 0 replies; 10+ messages in thread
From: Christophe JAILLET @ 2022-05-21 12:28 UTC (permalink / raw)
  To: Wolfram Sang, Miaoqian Lin, Florian Fainelli, Ray Jui,
	Scott Branden, bcm-kernel-feedback-list, Nicolas Saenz Julienne,
	Stefan Wahren, Eric Anholt, Lad Prabhakar, Annaliese McDermond,
	linux-i2c, linux-rpi-kernel, linux-arm-kernel, linux-kernel

Le 21/05/2022 à 13:46, Wolfram Sang a écrit :
> On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
>> In the error handling path, the clk_prepare_enable() function
>> call should be balanced by a corresponding 'clk_disable_unprepare()'
>> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
>> it should be balanced with call to clk_rate_exclusive_put().
>> , as already done in the remove function.
>>
>> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> 
> Looking for a reviewer here, pretty please?

Hi,

on which tree are you working?
A similar patch is already available in -next since several months. (see 
[1])

CJ

[1]: 
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/i2c/busses/i2c-bcm2835.c?id=b205f5850263632b6897d8f0bfaeeea4955f8663
> 
>> ---
>>   drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>>   1 file changed, 16 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
>> index 5149454eef4a..d794448866a7 100644
>> --- a/drivers/i2c/busses/i2c-bcm2835.c
>> +++ b/drivers/i2c/busses/i2c-bcm2835.c
>> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>   	ret = clk_prepare_enable(i2c_dev->bus_clk);
>>   	if (ret) {
>>   		dev_err(&pdev->dev, "Couldn't prepare clock");
>> -		return ret;
>> +		goto err_put_clk;
>>   	}
>>   
>>   	i2c_dev->irq = platform_get_irq(pdev, 0);
>> -	if (i2c_dev->irq < 0)
>> -		return i2c_dev->irq;
>> +	if (i2c_dev->irq < 0) {
>> +		ret =  i2c_dev->irq;
>> +		goto err_disable_clk;
>> +	}
>>   
>>   	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>>   			  dev_name(&pdev->dev), i2c_dev);
>>   	if (ret) {
>>   		dev_err(&pdev->dev, "Could not request IRQ\n");
>> -		return -ENODEV;
>> +		ret = -ENODEV;
>> +		goto err_disable_clk;
>>   	}
>>   
>>   	adap = &i2c_dev->adapter;
>> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>   
>>   	ret = i2c_add_adapter(adap);
>>   	if (ret)
>> -		free_irq(i2c_dev->irq, i2c_dev);
>> +		goto err_free_irq;
>> +
>> +	return ret;
>>   
>> +err_free_irq:
>> +	free_irq(i2c_dev->irq, i2c_dev);
>> +err_disable_clk:
>> +	clk_disable_unprepare(i2c_dev->bus_clk);
>> +err_put_clk:
>> +	clk_rate_exclusive_put(i2c_dev->bus_clk);
>>   	return ret;
>>   }
>>   
>> -- 
>> 2.17.1
>>


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-05-21 12:28     ` Christophe JAILLET
  0 siblings, 0 replies; 10+ messages in thread
From: Christophe JAILLET @ 2022-05-21 12:28 UTC (permalink / raw)
  To: Wolfram Sang, Miaoqian Lin, Florian Fainelli, Ray Jui,
	Scott Branden, bcm-kernel-feedback-list, Nicolas Saenz Julienne,
	Stefan Wahren, Eric Anholt, Lad Prabhakar, Annaliese McDermond,
	linux-i2c, linux-rpi-kernel, linux-arm-kernel, linux-kernel

Le 21/05/2022 à 13:46, Wolfram Sang a écrit :
> On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
>> In the error handling path, the clk_prepare_enable() function
>> call should be balanced by a corresponding 'clk_disable_unprepare()'
>> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
>> it should be balanced with call to clk_rate_exclusive_put().
>> , as already done in the remove function.
>>
>> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> 
> Looking for a reviewer here, pretty please?

Hi,

on which tree are you working?
A similar patch is already available in -next since several months. (see 
[1])

CJ

[1]: 
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/i2c/busses/i2c-bcm2835.c?id=b205f5850263632b6897d8f0bfaeeea4955f8663
> 
>> ---
>>   drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>>   1 file changed, 16 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
>> index 5149454eef4a..d794448866a7 100644
>> --- a/drivers/i2c/busses/i2c-bcm2835.c
>> +++ b/drivers/i2c/busses/i2c-bcm2835.c
>> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>   	ret = clk_prepare_enable(i2c_dev->bus_clk);
>>   	if (ret) {
>>   		dev_err(&pdev->dev, "Couldn't prepare clock");
>> -		return ret;
>> +		goto err_put_clk;
>>   	}
>>   
>>   	i2c_dev->irq = platform_get_irq(pdev, 0);
>> -	if (i2c_dev->irq < 0)
>> -		return i2c_dev->irq;
>> +	if (i2c_dev->irq < 0) {
>> +		ret =  i2c_dev->irq;
>> +		goto err_disable_clk;
>> +	}
>>   
>>   	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>>   			  dev_name(&pdev->dev), i2c_dev);
>>   	if (ret) {
>>   		dev_err(&pdev->dev, "Could not request IRQ\n");
>> -		return -ENODEV;
>> +		ret = -ENODEV;
>> +		goto err_disable_clk;
>>   	}
>>   
>>   	adap = &i2c_dev->adapter;
>> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>   
>>   	ret = i2c_add_adapter(adap);
>>   	if (ret)
>> -		free_irq(i2c_dev->irq, i2c_dev);
>> +		goto err_free_irq;
>> +
>> +	return ret;
>>   
>> +err_free_irq:
>> +	free_irq(i2c_dev->irq, i2c_dev);
>> +err_disable_clk:
>> +	clk_disable_unprepare(i2c_dev->bus_clk);
>> +err_put_clk:
>> +	clk_rate_exclusive_put(i2c_dev->bus_clk);
>>   	return ret;
>>   }
>>   
>> -- 
>> 2.17.1
>>


^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
  2022-05-21 12:28     ` Christophe JAILLET
@ 2022-05-21 13:56       ` Miaoqian Lin
  -1 siblings, 0 replies; 10+ messages in thread
From: Miaoqian Lin @ 2022-05-21 13:56 UTC (permalink / raw)
  To: Christophe JAILLET, Wolfram Sang, Florian Fainelli, Ray Jui,
	Scott Branden, bcm-kernel-feedback-list, Nicolas Saenz Julienne,
	Stefan Wahren, Eric Anholt, Lad Prabhakar, Annaliese McDermond,
	linux-i2c, linux-rpi-kernel, linux-arm-kernel, linux-kernel


On 2022/5/21 20:28, Christophe JAILLET wrote:
> Le 21/05/2022 à 13:46, Wolfram Sang a écrit :
>> On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
>>> In the error handling path, the clk_prepare_enable() function
>>> call should be balanced by a corresponding 'clk_disable_unprepare()'
>>> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
>>> it should be balanced with call to clk_rate_exclusive_put().
>>> , as already done in the remove function.
>>>
>>> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
>>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
>>
>> Looking for a reviewer here, pretty please?
>
> Hi,
>
> on which tree are you working?
> A similar patch is already available in -next since several months. (see [1])
>

Hi,

I mainly work on master, sorry I didn't notice it when submitted.

I may make a mistake with synchronize, thanks for your reply.

> CJ
>
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/i2c/busses/i2c-bcm2835.c?id=b205f5850263632b6897d8f0bfaeeea4955f8663
>>
>>> ---
>>>   drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>>>   1 file changed, 16 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
>>> index 5149454eef4a..d794448866a7 100644
>>> --- a/drivers/i2c/busses/i2c-bcm2835.c
>>> +++ b/drivers/i2c/busses/i2c-bcm2835.c
>>> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>>       ret = clk_prepare_enable(i2c_dev->bus_clk);
>>>       if (ret) {
>>>           dev_err(&pdev->dev, "Couldn't prepare clock");
>>> -        return ret;
>>> +        goto err_put_clk;
>>>       }
>>>         i2c_dev->irq = platform_get_irq(pdev, 0);
>>> -    if (i2c_dev->irq < 0)
>>> -        return i2c_dev->irq;
>>> +    if (i2c_dev->irq < 0) {
>>> +        ret =  i2c_dev->irq;
>>> +        goto err_disable_clk;
>>> +    }
>>>         ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>>>                 dev_name(&pdev->dev), i2c_dev);
>>>       if (ret) {
>>>           dev_err(&pdev->dev, "Could not request IRQ\n");
>>> -        return -ENODEV;
>>> +        ret = -ENODEV;
>>> +        goto err_disable_clk;
>>>       }
>>>         adap = &i2c_dev->adapter;
>>> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>>         ret = i2c_add_adapter(adap);
>>>       if (ret)
>>> -        free_irq(i2c_dev->irq, i2c_dev);
>>> +        goto err_free_irq;
>>> +
>>> +    return ret;
>>>   +err_free_irq:
>>> +    free_irq(i2c_dev->irq, i2c_dev);
>>> +err_disable_clk:
>>> +    clk_disable_unprepare(i2c_dev->bus_clk);
>>> +err_put_clk:
>>> +    clk_rate_exclusive_put(i2c_dev->bus_clk);
>>>       return ret;
>>>   }
>>>   -- 
>>> 2.17.1
>>>
>

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-05-21 13:56       ` Miaoqian Lin
  0 siblings, 0 replies; 10+ messages in thread
From: Miaoqian Lin @ 2022-05-21 13:56 UTC (permalink / raw)
  To: Christophe JAILLET, Wolfram Sang, Florian Fainelli, Ray Jui,
	Scott Branden, bcm-kernel-feedback-list, Nicolas Saenz Julienne,
	Stefan Wahren, Eric Anholt, Lad Prabhakar, Annaliese McDermond,
	linux-i2c, linux-rpi-kernel, linux-arm-kernel, linux-kernel


On 2022/5/21 20:28, Christophe JAILLET wrote:
> Le 21/05/2022 à 13:46, Wolfram Sang a écrit :
>> On Sun, Apr 03, 2022 at 06:33:08AM +0000, Miaoqian Lin wrote:
>>> In the error handling path, the clk_prepare_enable() function
>>> call should be balanced by a corresponding 'clk_disable_unprepare()'
>>> call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
>>> it should be balanced with call to clk_rate_exclusive_put().
>>> , as already done in the remove function.
>>>
>>> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
>>> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
>>
>> Looking for a reviewer here, pretty please?
>
> Hi,
>
> on which tree are you working?
> A similar patch is already available in -next since several months. (see [1])
>

Hi,

I mainly work on master, sorry I didn't notice it when submitted.

I may make a mistake with synchronize, thanks for your reply.

> CJ
>
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/i2c/busses/i2c-bcm2835.c?id=b205f5850263632b6897d8f0bfaeeea4955f8663
>>
>>> ---
>>>   drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
>>>   1 file changed, 16 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
>>> index 5149454eef4a..d794448866a7 100644
>>> --- a/drivers/i2c/busses/i2c-bcm2835.c
>>> +++ b/drivers/i2c/busses/i2c-bcm2835.c
>>> @@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>>       ret = clk_prepare_enable(i2c_dev->bus_clk);
>>>       if (ret) {
>>>           dev_err(&pdev->dev, "Couldn't prepare clock");
>>> -        return ret;
>>> +        goto err_put_clk;
>>>       }
>>>         i2c_dev->irq = platform_get_irq(pdev, 0);
>>> -    if (i2c_dev->irq < 0)
>>> -        return i2c_dev->irq;
>>> +    if (i2c_dev->irq < 0) {
>>> +        ret =  i2c_dev->irq;
>>> +        goto err_disable_clk;
>>> +    }
>>>         ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
>>>                 dev_name(&pdev->dev), i2c_dev);
>>>       if (ret) {
>>>           dev_err(&pdev->dev, "Could not request IRQ\n");
>>> -        return -ENODEV;
>>> +        ret = -ENODEV;
>>> +        goto err_disable_clk;
>>>       }
>>>         adap = &i2c_dev->adapter;
>>> @@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>>>         ret = i2c_add_adapter(adap);
>>>       if (ret)
>>> -        free_irq(i2c_dev->irq, i2c_dev);
>>> +        goto err_free_irq;
>>> +
>>> +    return ret;
>>>   +err_free_irq:
>>> +    free_irq(i2c_dev->irq, i2c_dev);
>>> +err_disable_clk:
>>> +    clk_disable_unprepare(i2c_dev->bus_clk);
>>> +err_put_clk:
>>> +    clk_rate_exclusive_put(i2c_dev->bus_clk);
>>>       return ret;
>>>   }
>>>   -- 
>>> 2.17.1
>>>
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
  2022-05-21 12:28     ` Christophe JAILLET
@ 2022-05-22 21:01       ` Wolfram Sang
  -1 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2022-05-22 21:01 UTC (permalink / raw)
  To: Christophe JAILLET
  Cc: Miaoqian Lin, Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Stefan Wahren,
	Eric Anholt, Lad Prabhakar, Annaliese McDermond, linux-i2c,
	linux-rpi-kernel, linux-arm-kernel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 61 bytes --]


> on which tree are you working?

Thanks for the heads up!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe
@ 2022-05-22 21:01       ` Wolfram Sang
  0 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2022-05-22 21:01 UTC (permalink / raw)
  To: Christophe JAILLET
  Cc: Miaoqian Lin, Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Nicolas Saenz Julienne, Stefan Wahren,
	Eric Anholt, Lad Prabhakar, Annaliese McDermond, linux-i2c,
	linux-rpi-kernel, linux-arm-kernel, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 61 bytes --]


> on which tree are you working?

Thanks for the heads up!


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-05-23  8:40 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03  6:33 [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe Miaoqian Lin
2022-04-03  6:33 ` Miaoqian Lin
2022-05-21 11:46 ` Wolfram Sang
2022-05-21 11:46   ` Wolfram Sang
2022-05-21 12:28   ` Christophe JAILLET
2022-05-21 12:28     ` Christophe JAILLET
2022-05-21 13:56     ` Miaoqian Lin
2022-05-21 13:56       ` Miaoqian Lin
2022-05-22 21:01     ` Wolfram Sang
2022-05-22 21:01       ` Wolfram Sang

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.