* [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
@ 2020-05-06 19:21 ` Christophe JAILLET
0 siblings, 0 replies; 6+ messages in thread
From: Christophe JAILLET @ 2020-05-06 19:21 UTC (permalink / raw)
To: wsa+renesas, peda, robh
Cc: linux-i2c, linux-kernel, kernel-janitors, Christophe JAILLET
A call to 'i2c_demux_deactivate_master()' is missing in the error handling
path, as already done in the remove function.
Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 0e16490eb3a1..5365199a31f4 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
err_rollback_available:
device_remove_file(&pdev->dev, &dev_attr_available_masters);
err_rollback:
+ i2c_demux_deactivate_master(priv);
for (j = 0; j < i; j++) {
of_node_put(priv->chan[j].parent_np);
of_changeset_destroy(&priv->chan[j].chgset);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
@ 2020-05-06 19:21 ` Christophe JAILLET
0 siblings, 0 replies; 6+ messages in thread
From: Christophe JAILLET @ 2020-05-06 19:21 UTC (permalink / raw)
To: wsa+renesas, peda, robh
Cc: linux-i2c, linux-kernel, kernel-janitors, Christophe JAILLET
A call to 'i2c_demux_deactivate_master()' is missing in the error handling
path, as already done in the remove function.
Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 0e16490eb3a1..5365199a31f4 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
err_rollback_available:
device_remove_file(&pdev->dev, &dev_attr_available_masters);
err_rollback:
+ i2c_demux_deactivate_master(priv);
for (j = 0; j < i; j++) {
of_node_put(priv->chan[j].parent_np);
of_changeset_destroy(&priv->chan[j].chgset);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
2020-05-06 19:21 ` Christophe JAILLET
@ 2020-05-12 13:08 ` Wolfram Sang
-1 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2020-05-12 13:08 UTC (permalink / raw)
To: Christophe JAILLET; +Cc: peda, robh, linux-i2c, linux-kernel, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
On Wed, May 06, 2020 at 09:21:00PM +0200, Christophe JAILLET wrote:
> A call to 'i2c_demux_deactivate_master()' is missing in the error handling
> path, as already done in the remove function.
>
> Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied to for-current, thanks! Peter, I hope you are okay with me
applying patches for my strange driver directly.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
@ 2020-05-12 13:08 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2020-05-12 13:08 UTC (permalink / raw)
To: Christophe JAILLET; +Cc: peda, robh, linux-i2c, linux-kernel, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
On Wed, May 06, 2020 at 09:21:00PM +0200, Christophe JAILLET wrote:
> A call to 'i2c_demux_deactivate_master()' is missing in the error handling
> path, as already done in the remove function.
>
> Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied to for-current, thanks! Peter, I hope you are okay with me
applying patches for my strange driver directly.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
2020-05-12 13:08 ` Wolfram Sang
@ 2020-05-12 14:40 ` Peter Rosin
-1 siblings, 0 replies; 6+ messages in thread
From: Peter Rosin @ 2020-05-12 14:40 UTC (permalink / raw)
To: Wolfram Sang, Christophe JAILLET
Cc: robh, linux-i2c, linux-kernel, kernel-janitors
On 2020-05-12 15:08, Wolfram Sang wrote:
> On Wed, May 06, 2020 at 09:21:00PM +0200, Christophe JAILLET wrote:
>> A call to 'i2c_demux_deactivate_master()' is missing in the error handling
>> path, as already done in the remove function.
>>
>> Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>
> Applied to for-current, thanks! Peter, I hope you are okay with me
> applying patches for my strange driver directly.
Absolutely, you have always "owned" that one. I prefer to stay out :-)
Cheers,
Peter
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
@ 2020-05-12 14:40 ` Peter Rosin
0 siblings, 0 replies; 6+ messages in thread
From: Peter Rosin @ 2020-05-12 14:40 UTC (permalink / raw)
To: Wolfram Sang, Christophe JAILLET
Cc: robh, linux-i2c, linux-kernel, kernel-janitors
On 2020-05-12 15:08, Wolfram Sang wrote:
> On Wed, May 06, 2020 at 09:21:00PM +0200, Christophe JAILLET wrote:
>> A call to 'i2c_demux_deactivate_master()' is missing in the error handling
>> path, as already done in the remove function.
>>
>> Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>
> Applied to for-current, thanks! Peter, I hope you are okay with me
> applying patches for my strange driver directly.
Absolutely, you have always "owned" that one. I prefer to stay out :-)
Cheers,
Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-12 14:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-06 19:21 [PATCH] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' Christophe JAILLET
2020-05-06 19:21 ` Christophe JAILLET
2020-05-12 13:08 ` Wolfram Sang
2020-05-12 13:08 ` Wolfram Sang
2020-05-12 14:40 ` Peter Rosin
2020-05-12 14:40 ` Peter Rosin
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.