Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "This is seven basic fixes (plus one MAINTAINER update) which came in close to the merge window" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: ipr: Fix error return code in ipr_probe_ioa() fcoe: add missing destroy_workqueue() on error in fcoe_init() lpfc: Fix possible NULL pointer dereference fcoe: Use default VLAN for FIP VLAN discovery ipr: Wait to do async scan until scsi host is initialized MAINTAINERS: Update cxlflash maintainers cxlflash: Verify problem state area is mapped before notifying shutdown lpfc: fix oops in lpfc_sli4_scmd_to_wqidx_distr() from lpfc_send_taskmgmt()
This commit is contained in:
@@ -778,7 +778,7 @@ static void notify_shutdown(struct cxlflash_cfg *cfg, bool wait)
|
||||
{
|
||||
struct afu *afu = cfg->afu;
|
||||
struct device *dev = &cfg->dev->dev;
|
||||
struct sisl_global_map __iomem *global = &afu->afu_map->global;
|
||||
struct sisl_global_map __iomem *global;
|
||||
struct dev_dependent_vals *ddv;
|
||||
u64 reg, status;
|
||||
int i, retry_cnt = 0;
|
||||
@@ -787,6 +787,14 @@ static void notify_shutdown(struct cxlflash_cfg *cfg, bool wait)
|
||||
if (!(ddv->flags & CXLFLASH_NOTIFY_SHUTDOWN))
|
||||
return;
|
||||
|
||||
if (!afu || !afu->afu_map) {
|
||||
dev_dbg(dev, "%s: The problem state area is not mapped\n",
|
||||
__func__);
|
||||
return;
|
||||
}
|
||||
|
||||
global = &afu->afu_map->global;
|
||||
|
||||
/* Notify AFU */
|
||||
for (i = 0; i < NUM_FC_PORTS; i++) {
|
||||
reg = readq_be(&global->fc_regs[i][FC_CONFIG2 / 8]);
|
||||
|
Viittaa uudesa ongelmassa
Block a user