1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f661ad1e500c..f3fd9f1711f7 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1734,7 +1734,6 @@ static int add_msa2xxx_enclosure_device(struct ctlr_info *h,
         if (is_scsi_rev_5(h))
                 return 0; /* p1210m doesn't need to do this. */
 
-#define MAX_MSA2XXX_ENCLOSURES 32
         if (*nmsa2xxx_enclosures >= MAX_MSA2XXX_ENCLOSURES) {
                 dev_warn(&h->pdev->dev, "Maximum number of MSA2XXX "
                         "enclosures exceeded.  Check your hardware "
@@ -1868,6 +1867,13 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
 
         /* Allocate the per device structures */
         for (i = 0; i < ndevs_to_allocate; i++) {
+                if (i >= HPSA_MAX_DEVICES) {
+                        dev_warn(&h->pdev->dev, "maximum devices (%d) exceeded."
+                                "  %d devices ignored.\n", HPSA_MAX_DEVICES,
+                                ndevs_to_allocate - HPSA_MAX_DEVICES);
+                        break;
+                }
+
                 currentsd[i] = kzalloc(sizeof(*currentsd[i]), GFP_KERNEL);
                 if (!currentsd[i]) {
                         dev_warn(&h->pdev->dev, "out of memory at %s:%d\n",