diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 10:26:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 10:26:40 -0700 |
| commit | 01073ac1b18f2a936b40607fec8dac887218efb7 (patch) | |
| tree | 7def658c6dd3423cfc7d005f77094a18f3ebf548 | |
| parent | 866ba84ea30f94838251f74becf3cfe3c2d5c0f9 (diff) | |
| parent | e2532b4af6366931e6f66b60338cf6b08a4b32ae (diff) | |
| download | linux-01073ac1b18f2a936b40607fec8dac887218efb7.tar.gz linux-01073ac1b18f2a936b40607fec8dac887218efb7.tar.bz2 linux-01073ac1b18f2a936b40607fec8dac887218efb7.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
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
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3bd956d3bc5d..dce42a416876 100644 --- 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, |