ipr: Fix sync scsi scan

bjking1 · torvalds · commit a3d1ddd932bc · 2016-08-09T10:17:42.000-07:00
Commit b195d5e ("ipr: Wait to do async scan until scsi host is initialized") fixed async scan for ipr, but broke sync scan for ipr. This fixes sync scan back up. Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Reported-and-tested-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10410,8 +10410,11 @@ static int ipr_probe(struct pci_dev pdev, const struct pci_device_id dev_id)`
`10410`	`10410`	`__ipr_remove(pdev);`
`10411`	`10411`	`return rc;`
`10412`	`10412`	`}`
	`10413`	`+ spin_lock_irqsave(ioa_cfg->host->host_lock, flags);`
	`10414`	`+ ioa_cfg->scan_enabled = 1;`
	`10415`	`+ schedule_work(&ioa_cfg->work_q);`
	`10416`	`+ spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);`
`10413`	`10417`
`10414`		`- scsi_scan_host(ioa_cfg->host);`
`10415`	`10418`	`ioa_cfg->iopoll_weight = ioa_cfg->chip_cfg->iopoll_weight;`
`10416`	`10419`
`10417`	`10420`	`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)`
`10421`	`10424`	`}`
`10422`	`10425`	`}`
`10423`	`10426`
`10424`		`- spin_lock_irqsave(ioa_cfg->host->host_lock, flags);`
`10425`		`- ioa_cfg->scan_enabled = 1;`
`10426`		`- schedule_work(&ioa_cfg->work_q);`
`10427`		`- spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);`
	`10427`	`+ scsi_scan_host(ioa_cfg->host);`
	`10428`	`+`
`10428`	`10429`	`return 0;`
`10429`	`10430`	`}`
`10430`	`10431`