lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[51/89] i2c/pca: Dont use *_interruptible
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    commit 22f8b2695eda496026623020811cae34590ee3d7 upstream.

    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>
    Acked-by: Jean Delvare <jdelvare@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    Tested with custom hardware.

    drivers/i2c/busses/i2c-pca-isa.c | 4 ++--
    drivers/i2c/busses/i2c-pca-platform.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/i2c/busses/i2c-pca-isa.c
    +++ b/drivers/i2c/busses/i2c-pca-isa.c
    @@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(voi
    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;
    }

    --- a/drivers/i2c/busses/i2c-pca-platform.c
    +++ b/drivers/i2c/busses/i2c-pca-platform.c
    @@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(
    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(in
    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;
    }



    \
     
     \ /
      Last update: 2010-03-31 02:27    [W:4.095 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site