[PATCH] libata: fixup return type of wait_for_completion_timeout

From: Nicholas Mc Guire
Date: Tue Feb 10 2015 - 03:43:47 EST

return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to reflect its use and the type adjusted to
unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>

Patch was only compile tested with x86_64_defconfig (implies CONFIG_ATA=y)

Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)

drivers/ata/libata-core.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4c35f08..bddf8b6 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1563,7 +1563,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
unsigned long flags;
unsigned int err_mask;
- int rc;
+ unsigned long irq_timeout;

spin_lock_irqsave(ap->lock, flags);

@@ -1644,14 +1644,15 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
if (ap->ops->error_handler)

- rc = wait_for_completion_timeout(&wait, msecs_to_jiffies(timeout));
+ irq_timeout = wait_for_completion_timeout(&wait,
+ msecs_to_jiffies(timeout));

if (ap->ops->error_handler)


- if (!rc) {
+ if (irq_timeout == 0) {
spin_lock_irqsave(ap->lock, flags);

/* We're racing with irq here. If we lose, the

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/