Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
dc1972d02747d2170fb1d78d114801f5ecb27506 (for cpm),
1ab082d7cbd0f34e39a5396cc6340c00bc5d66ef (for mpc),
b7af349b175af45f9d87b3bf3f0a221e1831ed39 (for omap).
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
authored by Wolfram Sang and committed by Jean Delvare 22f8b269 7d53e79f
+2
-2
drivers/i2c/busses/i2c-pca-isa.c
+2
-2
drivers/i2c/busses/i2c-pca-isa.c
···
75
unsigned long timeout;
76
77
if (irq > -1) {
78
-
ret = wait_event_interruptible_timeout(pca_wait,
79
pca_isa_readbyte(pd, I2C_PCA_CON)
80
& I2C_PCA_CON_SI, pca_isa_ops.timeout);
81
} else {
···
96
}
97
98
static irqreturn_t pca_handler(int this_irq, void *dev_id) {
99
-
wake_up_interruptible(&pca_wait);
100
return IRQ_HANDLED;
101
}
102
···
75
unsigned long timeout;
76
77
if (irq > -1) {
78
+
ret = wait_event_timeout(pca_wait,
79
pca_isa_readbyte(pd, I2C_PCA_CON)
80
& I2C_PCA_CON_SI, pca_isa_ops.timeout);
81
} else {
···
96
}
97
98
static irqreturn_t pca_handler(int this_irq, void *dev_id) {
99
+
wake_up(&pca_wait);
100
return IRQ_HANDLED;
101
}
102
+2
-2
drivers/i2c/busses/i2c-pca-platform.c
+2
-2
drivers/i2c/busses/i2c-pca-platform.c
···
84
unsigned long timeout;
85
86
if (i2c->irq) {
87
-
ret = wait_event_interruptible_timeout(i2c->wait,
88
i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
89
& I2C_PCA_CON_SI, i2c->adap.timeout);
90
} else {
···
122
if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
123
return IRQ_NONE;
124
125
-
wake_up_interruptible(&i2c->wait);
126
127
return IRQ_HANDLED;
128
}
···
84
unsigned long timeout;
85
86
if (i2c->irq) {
87
+
ret = wait_event_timeout(i2c->wait,
88
i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
89
& I2C_PCA_CON_SI, i2c->adap.timeout);
90
} else {
···
122
if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
123
return IRQ_NONE;
124
125
+
wake_up(&i2c->wait);
126
127
return IRQ_HANDLED;
128
}