* [PATCH] i2c: s3c2410: resume race fix
@ 2014-04-11 22:19 Doug Anderson
2014-04-23 9:50 ` Kukjin Kim
2014-05-14 15:59 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Doug Anderson @ 2014-04-11 22:19 UTC (permalink / raw)
To: Wolfram Sang
Cc: Olof Johansson, Doug Anderson, Ben Dooks, Kukjin Kim,
linux-arm-kernel, linux-samsung-soc, linux-i2c, linux-kernel
From: Olof Johansson <olof@lixom.net>
Don't unmark the device as suspended until after it's been re-setup.
The main race would be w.r.t. an i2c driver that gets resumed at the same
time (asyncronously), that is allowed to do a transfer since suspended
is set to 0 before reinit, but really should have seen the -EIO return
instead.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
drivers/i2c/busses/i2c-s3c2410.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index ae44910..bb3a996 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1276,10 +1276,10 @@ static int s3c24xx_i2c_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
- i2c->suspended = 0;
clk_prepare_enable(i2c->clk);
s3c24xx_i2c_init(i2c);
clk_disable_unprepare(i2c->clk);
+ i2c->suspended = 0;
return 0;
}
--
1.9.1.423.g4596e3a
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] i2c: s3c2410: resume race fix
2014-04-11 22:19 [PATCH] i2c: s3c2410: resume race fix Doug Anderson
@ 2014-04-23 9:50 ` Kukjin Kim
2014-05-14 15:59 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2014-04-23 9:50 UTC (permalink / raw)
To: 'Doug Anderson', 'Wolfram Sang'
Cc: 'Olof Johansson', 'Ben Dooks',
linux-arm-kernel, linux-samsung-soc, linux-i2c, linux-kernel
Doug Anderson wrote:
>
> From: Olof Johansson <olof@lixom.net>
>
> Don't unmark the device as suspended until after it's been re-setup.
>
> The main race would be w.r.t. an i2c driver that gets resumed at the same
> time (asyncronously), that is allowed to do a transfer since suspended
> is set to 0 before reinit, but really should have seen the -EIO return
> instead.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Thanks,
Kukjin
> ---
> drivers/i2c/busses/i2c-s3c2410.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-
> s3c2410.c
> index ae44910..bb3a996 100644
> --- a/drivers/i2c/busses/i2c-s3c2410.c
> +++ b/drivers/i2c/busses/i2c-s3c2410.c
> @@ -1276,10 +1276,10 @@ static int s3c24xx_i2c_resume(struct device *dev)
> struct platform_device *pdev = to_platform_device(dev);
> struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
>
> - i2c->suspended = 0;
> clk_prepare_enable(i2c->clk);
> s3c24xx_i2c_init(i2c);
> clk_disable_unprepare(i2c->clk);
> + i2c->suspended = 0;
>
> return 0;
> }
> --
> 1.9.1.423.g4596e3a
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] i2c: s3c2410: resume race fix
2014-04-11 22:19 [PATCH] i2c: s3c2410: resume race fix Doug Anderson
2014-04-23 9:50 ` Kukjin Kim
@ 2014-05-14 15:59 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2014-05-14 15:59 UTC (permalink / raw)
To: Doug Anderson
Cc: Olof Johansson, Ben Dooks, Kukjin Kim, linux-arm-kernel,
linux-samsung-soc, linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
On Fri, Apr 11, 2014 at 03:19:41PM -0700, Doug Anderson wrote:
> From: Olof Johansson <olof@lixom.net>
>
> Don't unmark the device as suspended until after it's been re-setup.
>
> The main race would be w.r.t. an i2c driver that gets resumed at the same
> time (asyncronously), that is allowed to do a transfer since suspended
> is set to 0 before reinit, but really should have seen the -EIO return
> instead.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
Applied to for-current, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-14 16:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-11 22:19 [PATCH] i2c: s3c2410: resume race fix Doug Anderson
2014-04-23 9:50 ` Kukjin Kim
2014-05-14 15:59 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).