On Fri, Sep 24, 2010 at 04:50:09PM +0200, Marc Kleine-Budde wrote:
> Hello Ben,
>
> what about this patch?
Ben, any reason you did not pick up this one while you were picking up
other patches?
>
> cheers, Marc
>
> --------8<--------8<--------8<--------8<--------8<--------8<--------
>
> The i2c_imx_trx_complete() function is using
> wait_event_interruptible_timeout() to wait for the I2C controller to
> signal that it has completed an I2C bus operation. If the process that
> causes the I2C operation receives a signal, the wait will be
> interrupted, returning an error. It is better to let the I2C operation
> finished before handling the signal (i.e. returning into userspace).
>
> It is safe to use wait_event_timeout() instead, because the timeout
> will allow the process to exit if the I2C bus hangs. It's also better
> to allow the I2C operation to finish, because unacknowledged I2C
> operations can cause the I2C bus to hang.
>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> Reviewed-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> ---
>
> V2: Remove check for "result < 0" as commented by Wolfram Sang.
> V3: Remove "result" entirely.
>
> drivers/i2c/busses/i2c-imx.c | 12 +++---------
> 1 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> index d1ff940..4c2a62b 100644
> --- a/drivers/i2c/busses/i2c-imx.c
> +++ b/drivers/i2c/busses/i2c-imx.c
> @@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct
> *i2c_imx, int for_busy)
>
> static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx)
> {
> - int result;
> -
> - result = wait_event_interruptible_timeout(i2c_imx->queue,
> - i2c_imx->i2csr & I2SR_IIF, HZ / 10);
> + wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);
>
> - if (unlikely(result < 0)) {
> - dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
> - return result;
> - } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
> + if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
> dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__);
> return -ETIMEDOUT;
> }
> @@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
> i2c_imx->i2csr = temp;
> temp &= ~I2SR_IIF;
> writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
> - wake_up_interruptible(&i2c_imx->queue);
> + wake_up(&i2c_imx->queue);
> return IRQ_HANDLED;
> }
>
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
>
>
>
>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
