Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f8b269 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jean Delvare
Browse files

i2c/pca: Don't use *_interruptible 



Unexpected signals can disturb the bus-handling and lock it up. Don't use
interruptible in 'wait_event_*' and 'wake_*' as in commits
dc1972d0 (for cpm),
1ab082d7 (for mpc),
b7af349b (for omap).

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 7d53e79f

drivers/i2c/busses/i2c-pca-isa.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {
@@ -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;

}

drivers/i2c/busses/i2c-pca-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {
@@ -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;

}