Skip to content

Commit

Permalink
i2c-nomadik: Do not use _interruptible_ variant call
Browse files Browse the repository at this point in the history
If there is a signal pending and wait_for_completion_interruptible_timeout
exited because of the -ERESTARTSYS error we are unable to send any more
i2c messages.

So, deprecate this _interruptible_ variant call.

Signed-off-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
srinidhi kasagar authored and Ben Dooks committed Aug 23, 2011
1 parent fcb8ce5 commit 4b723a4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/i2c/busses/i2c-nomadik.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,12 @@ static int read_i2c(struct nmk_i2c_dev *dev)
writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask,
dev->virtbase + I2C_IMSCR);

timeout = wait_for_completion_interruptible_timeout(
timeout = wait_for_completion_timeout(
&dev->xfer_complete, dev->adap.timeout);

if (timeout < 0) {
dev_err(&dev->pdev->dev,
"wait_for_completion_interruptible_timeout"
"wait_for_completion_timeout"
"returned %d waiting for event\n", timeout);
status = timeout;
}
Expand Down Expand Up @@ -504,12 +504,12 @@ static int write_i2c(struct nmk_i2c_dev *dev)
writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask,
dev->virtbase + I2C_IMSCR);

timeout = wait_for_completion_interruptible_timeout(
timeout = wait_for_completion_timeout(
&dev->xfer_complete, dev->adap.timeout);

if (timeout < 0) {
dev_err(&dev->pdev->dev,
"wait_for_completion_interruptible_timeout"
"wait_for_completion_timeout"
"returned %d waiting for event\n", timeout);
status = timeout;
}
Expand Down

0 comments on commit 4b723a4

Please sign in to comment.