Skip to content

Commit

Permalink
i2c/pca: Don't use *_interruptible
Browse files Browse the repository at this point in the history
Unexpected signals can disturb the bus-handling and lock it up. Don't use
interruptible in 'wait_event_*' and 'wake_*' as in commits
dc1972d (for cpm),
1ab082d (for mpc),
b7af349 (for omap).

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Wolfram Sang authored and Jean Delvare committed Jan 16, 2010
1 parent 7d53e79 commit 22f8b26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/i2c/busses/i2c-pca-isa.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(void *pd)
unsigned long timeout;

if (irq > -1) {
ret = wait_event_interruptible_timeout(pca_wait,
ret = wait_event_timeout(pca_wait,
pca_isa_readbyte(pd, I2C_PCA_CON)
& I2C_PCA_CON_SI, pca_isa_ops.timeout);
} else {
Expand All @@ -96,7 +96,7 @@ static void pca_isa_resetchip(void *pd)
}

static irqreturn_t pca_handler(int this_irq, void *dev_id) {
wake_up_interruptible(&pca_wait);
wake_up(&pca_wait);
return IRQ_HANDLED;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/i2c/busses/i2c-pca-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(void *pd)
unsigned long timeout;

if (i2c->irq) {
ret = wait_event_interruptible_timeout(i2c->wait,
ret = wait_event_timeout(i2c->wait,
i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
& I2C_PCA_CON_SI, i2c->adap.timeout);
} else {
Expand Down Expand Up @@ -122,7 +122,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
return IRQ_NONE;

wake_up_interruptible(&i2c->wait);
wake_up(&i2c->wait);

return IRQ_HANDLED;
}
Expand Down

0 comments on commit 22f8b26

Please sign in to comment.