| From ce78cc071f5f541480e381cc0241d37590041a9d Mon Sep 17 00:00:00 2001 |
| From: Olof Johansson <olof@lixom.net> |
| Date: Fri, 11 Apr 2014 15:19:41 -0700 |
| Subject: i2c: s3c2410: resume race fix |
| |
| From: Olof Johansson <olof@lixom.net> |
| |
| commit ce78cc071f5f541480e381cc0241d37590041a9d upstream. |
| |
| 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> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/i2c/busses/i2c-s3c2410.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/i2c/busses/i2c-s3c2410.c |
| +++ b/drivers/i2c/busses/i2c-s3c2410.c |
| @@ -1204,10 +1204,10 @@ static int s3c24xx_i2c_resume(struct 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; |
| } |
