2012-02-23 12:19:17

by Oskar Schirmer

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
drivers/i2c/busses/i2c-imx.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 58832e5..124d9c5 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)
break;
if (!for_busy && !(temp & I2SR_IBB))
break;
- if (signal_pending(current)) {
- dev_dbg(&i2c_imx->adapter.dev,
- "<%s> I2C Interrupted\n", __func__);
- return -EINTR;
- }
if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> I2C bus is busy\n", __func__);
--
1.7.5.4


2012-02-29 19:06:29

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] i2c/imx: fix imx driver to work though signal is pending

On Thu, Feb 23, 2012 at 12:19:11PM +0000, Oskar Schirmer wrote:
> 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 <[email protected]>

Thanks. Picked to my for-3.4 branch. I'd like to have some more test coverage,
then we can send it back via a stable-release. If you think it should go into
3.3 directly, please let me know.

Oh, and it got acked by Marc Kleine-Budde via phone :)

Regards,

Wolfram

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |


Attachments:
(No filename) (0.99 kB)
signature.asc (198.00 B)
Digital signature
Download all attachments