Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

torvalds · torvalds · commit 01073ac1b18f · 2017-11-03T10:26:40.000-07:00
Pull SCSI fix from James Bottomley:
 "One minor fix in the error leg of the qla2xxx driver (it oopses the
  system if we get an error trying to start the internal kernel thread).

  The fix is minor because the problem isn't often encountered in the
  field (although it can be induced by inserting the module in a low
  memory environment)"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Fix oops in qla2x00_probe_one error path
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -3212,6 +3212,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		ql_log(ql_log_fatal, base_vha, 0x00ed,
 		    "Failed to start DPC thread.\n");
 		ret = PTR_ERR(ha->dpc_thread);
+		ha->dpc_thread = NULL;
 		goto probe_failed;
 	}
 	ql_dbg(ql_dbg_init, base_vha, 0x00ee,

Original file line number	Diff line number	Diff line change
`@@ -3212,6 +3212,7 @@ qla2x00_probe_one(struct pci_dev pdev, const struct pci_device_id id)`
`3212`	`3212`	`ql_log(ql_log_fatal, base_vha, 0x00ed,`
`3213`	`3213`	`"Failed to start DPC thread.\n");`
`3214`	`3214`	`ret = PTR_ERR(ha->dpc_thread);`
	`3215`	`+ ha->dpc_thread = NULL;`
`3215`	`3216`	`goto probe_failed;`
`3216`	`3217`	`}`
`3217`	`3218`	`ql_dbg(ql_dbg_init, base_vha, 0x00ee,`