From: Don Brace <don.brace@microsemi.com>
Date: Fri, 20 Oct 2017 21:51:57 +0000 (-0500)
Subject: scsi: hpsa: reduce warning messages on device removal
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9211a07fc1b25d9d437c5ccd39cb1596eb9adb06;p=openwrt%2Fstaging%2Fblogic.git

scsi: hpsa: reduce warning messages on device removal

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 27a1aca085b3..228d74465fd0 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1865,11 +1865,13 @@ static void hpsa_wait_for_outstanding_commands_for_dev(struct ctlr_info *h,
 			break;
 		if (++waits > 20)
 			break;
+		msleep(1000);
+	}
+
+	if (waits > 20)
 		dev_warn(&h->pdev->dev,
 			"%s: removing device with %d outstanding commands!\n",
 			__func__, cmds);
-		msleep(1000);
-	}
 }
 
 static void hpsa_remove_device(struct ctlr_info *h,