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

Pull SCSI fixes from James Bottomley:
 "Six minor fixes to device drivers and one to the multipath alua
  handler.

  The most extensive fix is the zfcp port remove prevention one, but
  it's impact is only s390"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: libsas: delete sas port if expander discover failed
  scsi: libsas: only clear phy->in_shutdown after shutdown event done
  scsi: scsi_dh_alua: Fix possible null-ptr-deref
  scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask
  scsi: zfcp: fix to prevent port_remove with pure auto scan LUNs (only sdevs)
  scsi: zfcp: fix missing zfcp_port reference put on -EBUSY from port_remove
  scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route()

diff --combined drivers/scsi/device_handler/scsi_dh_alua.c
index a7a4a77,2a9dcb8..f0066f8
--- 1/drivers/scsi/device_handler/scsi_dh_alua.c
--- 2/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@@ -1,9 -1,23 +1,9 @@@
 +// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Generic SCSI-3 ALUA SCSI Device Handler
   *
   * Copyright (C) 2007-2010 Hannes Reinecke, SUSE Linux Products GmbH.
   * All rights reserved.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 - *
   */
  #include <linux/slab.h>
  #include <linux/delay.h>
@@@ -1160,10 -1174,8 +1160,8 @@@ static int __init alua_init(void
        int r;
  
        kaluad_wq = alloc_workqueue("kaluad", WQ_MEM_RECLAIM, 0);
-       if (!kaluad_wq) {
-               /* Temporary failure, bypass */
-               return SCSI_DH_DEV_TEMP_BUSY;
-       }
+       if (!kaluad_wq)
+               return -ENOMEM;
  
        r = scsi_register_device_handler(&alua_dh);
        if (r != 0) {