summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatish Kharat <satishkh@cisco.com>2019-01-14 20:09:27 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2019-01-22 21:18:34 -0500
commit120dbfd94c4d5c9634d1f8fb12aa92520eee117c (patch)
treec51c24139b804f75e1f4cc0b3e54c48650d2bce7
parente8bfe3e7ffc380540deeecd8565b9912d6ed87c2 (diff)
scsi: fnic: delaying vnic dev enable till after req intr
Doing vnic_device_enable before this could cause interrupts to happen before they are setup. Signed-off-by: Satish Kharat <satishkh@cisco.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/fnic/fnic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 6aefedd1e669..7a5665acf280 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -880,8 +880,6 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
880 880
881 fc_fabric_login(lp); 881 fc_fabric_login(lp);
882 882
883 vnic_dev_enable(fnic->vdev);
884
885 err = fnic_request_intr(fnic); 883 err = fnic_request_intr(fnic);
886 if (err) { 884 if (err) {
887 shost_printk(KERN_ERR, fnic->lport->host, 885 shost_printk(KERN_ERR, fnic->lport->host,
@@ -889,6 +887,8 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
889 goto err_out_free_exch_mgr; 887 goto err_out_free_exch_mgr;
890 } 888 }
891 889
890 vnic_dev_enable(fnic->vdev);
891
892 for (i = 0; i < fnic->intr_count; i++) 892 for (i = 0; i < fnic->intr_count; i++)
893 vnic_intr_unmask(&fnic->intr[i]); 893 vnic_intr_unmask(&fnic->intr[i]);
894 894