diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 11:58:12 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 11:58:12 -0400 |
| commit | ec65e6beb02e09e34f3811dd85f7247da35edafc (patch) | |
| tree | ecaa55e109261b04d00d81add853f1ba20838523 /drivers/scsi/elx/libefc/efc_fabric.c | |
| parent | 605ae389ea0243344713648294cd86b442d255ee (diff) | |
| parent | 258aad75c62146453d03028a44f2f1590d58e1f6 (diff) | |
| download | linux-ec65e6beb02e09e34f3811dd85f7247da35edafc.tar.bz2 | |
Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging
Merge the 5.15/scsi-fixes branch into the staging tree to resolve UFS
conflict reported by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/elx/libefc/efc_fabric.c')
| -rw-r--r-- | drivers/scsi/elx/libefc/efc_fabric.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/elx/libefc/efc_fabric.c b/drivers/scsi/elx/libefc/efc_fabric.c index f9412437ad47..9661eea93aa1 100644 --- a/drivers/scsi/elx/libefc/efc_fabric.c +++ b/drivers/scsi/elx/libefc/efc_fabric.c @@ -107,7 +107,6 @@ void efc_fabric_notify_topology(struct efc_node *node) { struct efc_node *tmp_node; - enum efc_nport_topology topology = node->nport->topology; unsigned long index; /* @@ -118,7 +117,7 @@ efc_fabric_notify_topology(struct efc_node *node) if (tmp_node != node) { efc_node_post_event(tmp_node, EFC_EVT_NPORT_TOPOLOGY_NOTIFY, - (void *)topology); + &node->nport->topology); } } } |