Skip to contentSkip to conversation

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

DISCUSSION EUNBONG SONG 1 participant 1 message Mar 22, 2013

Subsystems (2)
I2C subsystem host drivers Cavium I2C driver
lore
Share & tools
lore

EUNBONG SONG

author
#0 lore raw
Quoted 3 lines

Basically OK, but you have lots of whitespace issues, so I can't apply your patch. Please resend and make sure it applies.

Sorry, I rewrite my patch here.

Signed-off-by EunBong Song <[email protected]>

---

 drivers/i2c/busses/i2c-octeon.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-octeon.c +4 -4
index 935585e..b2e3259 100644
@@ -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);
Signature · 3 lines
1.7.0.1

Thanks.