[PATCH 19/24] aacraid: move scsi_add_host()

[Hannes Reinecke]

Move the call to scsi_add_host() so that the Scsi_Host structure
is initialized before any I/O is sent.

Signed-off-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/aacraid/linit.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 8e28a505f7e8..71d97881fc26 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1669,6 +1669,9 @@ static int aac_probe_one(struct pci_dev *pdev, const 
struct pci_device_id *id)
        shost->unique_id = unique_id;
        shost->max_cmd_len = 16;
        shost->use_cmd_list = 1;
+       shost->max_id = MAXIMUM_NUM_CONTAINERS;
+       shost->max_lun = AAC_MAX_LUN;
+       shost->sg_tablesize = HBA_MAX_SG_SEPARATE;
 
        if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
                aac_init_char();
@@ -1731,6 +1734,10 @@ static int aac_probe_one(struct pci_dev *pdev, const 
struct pci_device_id *id)
                goto out_deinit;
        }
 
+       error = scsi_add_host(shost, &pdev->dev);
+       if (error)
+               goto out_deinit;
+
        aac->maximum_num_channels = aac_drivers[index].channels;
        error = aac_get_adapter_info(aac);
        if (error < 0)
@@ -1789,18 +1796,8 @@ static int aac_probe_one(struct pci_dev *pdev, const 
struct pci_device_id *id)
        if (!aac->sa_firmware && aac_drivers[index].quirks & AAC_QUIRK_SRC)
                aac_intr_normal(aac, 0, 2, 0, NULL);
 
-       /*
-        * dmb - we may need to move the setting of these parms somewhere else 
once
-        * we get a fib that can report the actual numbers
-        */
-       shost->max_lun = AAC_MAX_LUN;
-
        pci_set_drvdata(pdev, shost);
 
-       error = scsi_add_host(shost, &pdev->dev);
-       if (error)
-               goto out_deinit;
-
        aac_scan_host(aac);
 
        pci_enable_pcie_error_reporting(pdev);
-- 
2.16.4