mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
ipr: Fix sync scsi scan
Commit b195d5e2bf
("ipr: Wait to do async scan until scsi host is
initialized") fixed async scan for ipr, but broke sync scan. This fixes
sync scan back up.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
e7f851684e
commit
0d7826ddde
1 changed files with 6 additions and 5 deletions
|
@ -10410,8 +10410,11 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
|
|||
__ipr_remove(pdev);
|
||||
return rc;
|
||||
}
|
||||
spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
|
||||
ioa_cfg->scan_enabled = 1;
|
||||
schedule_work(&ioa_cfg->work_q);
|
||||
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
|
||||
|
||||
scsi_scan_host(ioa_cfg->host);
|
||||
ioa_cfg->iopoll_weight = ioa_cfg->chip_cfg->iopoll_weight;
|
||||
|
||||
if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
|
||||
|
@ -10421,10 +10424,8 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
|
|||
}
|
||||
}
|
||||
|
||||
spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
|
||||
ioa_cfg->scan_enabled = 1;
|
||||
schedule_work(&ioa_cfg->work_q);
|
||||
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
|
||||
scsi_scan_host(ioa_cfg->host);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue