Merge branch 'mkp-fixes' into fixes

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index bff95090e52ad5b9a779ea54aa4297a95a07e96a..a3860367b568aa06adf4290bf84717458c241e77 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5260,7 +5260,6 @@ static int hpsa_scan_finished(struct Scsi_Host *sh,
 static int hpsa_scsi_host_alloc(struct ctlr_info *h)
 {
        struct Scsi_Host *sh;
-       int error;
 
        sh = scsi_host_alloc(&hpsa_driver_template, sizeof(h));
        if (sh == NULL) {
@@ -5282,14 +5281,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h)
        sh->hostdata[0] = (unsigned long) h;
        sh->irq = h->intr[h->intr_mode];
        sh->unique_id = sh->irq;
-       error = scsi_init_shared_tag_map(sh, sh->can_queue);
-       if (error) {
-               dev_err(&h->pdev->dev,
-                       "%s: scsi_init_shared_tag_map failed for controller %d\n",
-                       __func__, h->ctlr);
-                       scsi_host_put(sh);
-                       return error;
-       }
+
        h->scsi_host = sh;
        return 0;
 }