Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / scsi / csiostor / csio_scsi.c

diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index c2a6f9f..89a52b9 100644 (file)
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -1721,7 +1721,7 @@ out:
 
        /* Wake up waiting threads */
        csio_scsi_cmnd(req) = NULL;
-       complete_all(&req->cmplobj);
+       complete(&req->cmplobj);
 }
 
 /*
@@ -1945,6 +1945,7 @@ csio_eh_abort_handler(struct scsi_cmnd *cmnd)
        ready = csio_is_lnode_ready(ln);
        tmo = CSIO_SCSI_ABRT_TMO_MS;
 
+       reinit_completion(&ioreq->cmplobj);
        spin_lock_irq(&hw->lock);
        rv = csio_do_abrt_cls(hw, ioreq, (ready ? SCSI_ABORT : SCSI_CLOSE));
        spin_unlock_irq(&hw->lock);
@@ -1964,8 +1965,6 @@ csio_eh_abort_handler(struct scsi_cmnd *cmnd)
                goto inval_scmnd;
        }
 
-       /* Wait for completion */
-       init_completion(&ioreq->cmplobj);
        wait_for_completion_timeout(&ioreq->cmplobj, msecs_to_jiffies(tmo));
 
        /* FW didnt respond to abort within our timeout */