From: 송은봉 Date: Wed, 17 Apr 2013 21:40:17 +0000 (+0000) Subject: i2c: octeon: Fix i2c fail problem when a process is terminated by a signal X-Git-Tag: upstream/snapshot3+hdmi~5215^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2637e5fd232d421b680757944f613d4b1a36ae26;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git i2c: octeon: Fix i2c fail problem when a process is terminated by a signal 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 Signed-off-by: Wolfram Sang --- 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);