aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorOskar Schirmer <oskar@scara.com>2012-02-23 07:19:11 -0500
committerWolfram Sang <w.sang@pengutronix.de>2012-02-29 14:21:24 -0500
commitbb79a0798d7c430f012f2f906fd7873f8976bc89 (patch)
tree88dd7787d99fedb483a980cc593ac13d373619c6 /drivers/i2c
parent104522806a7d9d47c34f425dee2bcd7f1ee5613e (diff)
i2c: imx: fix imx driver to work though signal is pending
Interrupt a test application for I2C based mc13xxx driven touch panel, SIGINT, causes open event file descriptor to be closed, which in turn causes I2C activity to mask PMIC local interrupts. This eventually ends up in i2c_imx_bus_busy to wait for some busy flag to toggle, but while waiting it would find a signal pending and break. The final symptom is the device is not closed down cleanly and thus not reopenable. Do without check for pending signal. Signed-off-by: Oskar Schirmer <oskar@scara.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-imx.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 58832e578ff..124d9c594f4 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -149,11 +149,6 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
149 break; 149 break;
150 if (!for_busy && !(temp & I2SR_IBB)) 150 if (!for_busy && !(temp & I2SR_IBB))
151 break; 151 break;
152 if (signal_pending(current)) {
153 dev_dbg(&i2c_imx->adapter.dev,
154 "<%s> I2C Interrupted\n", __func__);
155 return -EINTR;
156 }
157 if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) { 152 if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) {
158 dev_dbg(&i2c_imx->adapter.dev, 153 dev_dbg(&i2c_imx->adapter.dev,
159 "<%s> I2C bus is busy\n", __func__); 154 "<%s> I2C bus is busy\n", __func__);