diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-22 18:39:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-22 18:39:03 +0200 |
| commit | f4102766463a66026bd4af6c30cbbd01f10e6c42 (patch) | |
| tree | 6d7232d9f49d8f8d56cc3d3889767aed25319f90 /drivers/scsi/qedi/qedi_main.c | |
| parent | Merge tag 'powerpc-5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | scsi: qla2xxx: Fix hardlockup in abort command during driver remove (diff) | |
| download | linux-f4102766463a66026bd4af6c30cbbd01f10e6c42.tar.xz linux-f4102766463a66026bd4af6c30cbbd01f10e6c42.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Three driver fixes (and one version number update): a suspend hang in
ufs, a qla hard lock on module removal and a qedi panic during
discovery"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: qla2xxx: Fix hardlockup in abort command during driver remove
scsi: ufs: Avoid runtime suspend possibly being blocked forever
scsi: qedi: update driver version to 8.37.0.20
scsi: qedi: Check targetname while finding boot target information
Diffstat (limited to 'drivers/scsi/qedi/qedi_main.c')
| -rw-r--r-- | drivers/scsi/qedi/qedi_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c index 8814bfcb6449..f210a3e0c9b1 100644 --- a/drivers/scsi/qedi/qedi_main.c +++ b/drivers/scsi/qedi/qedi_main.c @@ -987,6 +987,9 @@ static int qedi_find_boot_info(struct qedi_ctx *qedi, if (!iscsi_is_session_online(cls_sess)) continue; + if (!sess->targetname) + continue; + if (pri_ctrl_flags) { if (!strcmp(pri_tgt->iscsi_name, sess->targetname) && !strcmp(pri_tgt->ip_addr, ep_ip_addr)) { |