Patchwork I2C: Fix i2c fail problem when a process is terminated by a signal on octeon in 3.8

login
register
mail settings
Submitter 송은봉
Date April 18, 2013, 7:40 a.m.
Message ID <11412343.361631366270816380.JavaMail.weblogic@epv6ml12>
Download mbox | patch
Permalink /patch/237471/
State Accepted
Headers show

Comments

송은봉 - April 18, 2013, 7:40 a.m.
I rewrite my patch because the patch before i sent have many white space.
Thanks!
---
I've been debugging the abnormal operation of i2c on octeon.
If a process is terminated by signal in the middle of i2c operation,
next i2c read operation which is done by another process was failed.
So i changed to ignore signal in the middle of i2c operation.
After that the problem was not reproduced.

Signed-off-by: Eunbong Song <eunb.song@samsung.com>

---
 drivers/i2c/busses/i2c-octeon.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

-- 
1.7.0.4
Wolfram Sang - April 19, 2013, 6:30 p.m.
On Thu, Apr 18, 2013 at 07:40:16AM +0000, 송은봉 wrote:
> 
> I rewrite my patch because the patch before i sent have many white space.
> Thanks!

This should have been below the "---" after the sigend-off.

> ---
> I've been debugging the abnormal operation of i2c on octeon.
> If a process is terminated by signal in the middle of i2c operation,
> next i2c read operation which is done by another process was failed.
> So i changed to ignore signal in the middle of i2c operation.
> After that the problem was not reproduced.
> 
> Signed-off-by: Eunbong Song <eunb.song@samsung.com>

Applied to for-next, thanks!

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c

index 935585e..b2e3259 100644

--- a/drivers/i2c/busses/i2c-octeon.c

+++ b/drivers/i2c/busses/i2c-octeon.c

@@ -183,7 +183,7 @@  static irqreturn_t octeon_i2c_isr(int irq, void *dev_id)

 	struct octeon_i2c *i2c = dev_id;
 
 	octeon_i2c_int_disable(i2c);
-	wake_up_interruptible(&i2c->queue);

+	wake_up(&i2c->queue);

 
 	return IRQ_HANDLED;
 }
@@ -206,9 +206,9 @@  static int octeon_i2c_wait(struct octeon_i2c *i2c)

 
 	octeon_i2c_int_enable(i2c);
 
-	result = wait_event_interruptible_timeout(i2c->queue,

-						  octeon_i2c_test_iflg(i2c),

-						  i2c->adap.timeout);

+	result = wait_event_timeout(i2c->queue,

+					octeon_i2c_test_iflg(i2c),

+					i2c->adap.timeout);

 
 	octeon_i2c_int_disable(i2c);