aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsrinidhi kasagar <srinidhi.kasagar@stericsson.com>2011-08-09 14:17:22 -0400
committerBen Dooks <ben-linux@fluff.org>2011-08-23 15:13:39 -0400
commit4b723a471050a8b80f7fa86e76f01f4c711b3443 (patch)
treed017d2a18ccb6f1ad4c0bd25d1821c3d9a4cba91
parentfcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff)
i2c-nomadik: Do not use _interruptible_ variant call
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>
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 0c731ca69f15..f9b8854fe0a5 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -417,12 +417,12 @@ static int read_i2c(struct nmk_i2c_dev *dev)
417 writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask, 417 writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask,
418 dev->virtbase + I2C_IMSCR); 418 dev->virtbase + I2C_IMSCR);
419 419
420 timeout = wait_for_completion_interruptible_timeout( 420 timeout = wait_for_completion_timeout(
421 &dev->xfer_complete, dev->adap.timeout); 421 &dev->xfer_complete, dev->adap.timeout);
422 422
423 if (timeout < 0) { 423 if (timeout < 0) {
424 dev_err(&dev->pdev->dev, 424 dev_err(&dev->pdev->dev,
425 "wait_for_completion_interruptible_timeout" 425 "wait_for_completion_timeout"
426 "returned %d waiting for event\n", timeout); 426 "returned %d waiting for event\n", timeout);
427 status = timeout; 427 status = timeout;
428 } 428 }
@@ -504,12 +504,12 @@ static int write_i2c(struct nmk_i2c_dev *dev)
504 writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask, 504 writel(readl(dev->virtbase + I2C_IMSCR) | irq_mask,
505 dev->virtbase + I2C_IMSCR); 505 dev->virtbase + I2C_IMSCR);
506 506
507 timeout = wait_for_completion_interruptible_timeout( 507 timeout = wait_for_completion_timeout(
508 &dev->xfer_complete, dev->adap.timeout); 508 &dev->xfer_complete, dev->adap.timeout);
509 509
510 if (timeout < 0) { 510 if (timeout < 0) {
511 dev_err(&dev->pdev->dev, 511 dev_err(&dev->pdev->dev,
512 "wait_for_completion_interruptible_timeout" 512 "wait_for_completion_timeout"
513 "returned %d waiting for event\n", timeout); 513 "returned %d waiting for event\n", timeout);
514 status = timeout; 514 status = timeout;
515 } 515 }