Skip to content

Commit

Permalink
i2c: octeon: Fix i2c fail problem when a process is terminated by a s…
Browse files Browse the repository at this point in the history
…ignal

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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
송은봉 authored and Wolfram Sang committed Apr 19, 2013
1 parent aaedeb6 commit 2637e5f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/i2c/busses/i2c-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);

Expand Down

0 comments on commit 2637e5f

Please sign in to comment.