scsi: aacraid: Change wait time for fib completion

BugLink: http://bugs.launchpad.net/bugs/1689980
Change the completion wait time for the fibs in the reset and abort
callback from 2 minutes to 15 seconds.

2 minutes is too long for waiting for completion.

Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: David Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 30ad417155a8026c12cfefa9b2ca7f448d6570ba linux-next)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 9ef98e40d81a01bce8fd0b4a95355a89e18616d1..f6a11af0432bef774b913bec84595fff906df7cf 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -684,8 +684,8 @@ static int aac_eh_abort(struct scsi_cmnd* cmd)
                                  (fib_callback) aac_hba_callback,
                                  (void *) cmd);
 
-               /* Wait up to 2 minutes for completion */
-               for (count = 0; count < 120; ++count) {
+               /* Wait up to 15 secs for completion */
+               for (count = 0; count < 15; ++count) {
                        if (cmd->SCp.sent_command) {
                                ret = SUCCESS;
                                break;
@@ -840,8 +840,8 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                                  (fib_callback) aac_hba_callback,
                                  (void *) cmd);
 
-               /* Wait up to 2 minutes for completion */
-               for (count = 0; count < 120; ++count) {
+               /* Wait up to 15 seconds for completion */
+               for (count = 0; count < 15; ++count) {
                        if (cmd->SCp.sent_command) {
                                ret = SUCCESS;
                                break;