diff options
-rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 5 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_ccw.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 6fed4a532ca3..bfe3ba73bc0f 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
@@ -1403,15 +1403,14 @@ zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn, u32 status, | |||
1403 | void | 1403 | void |
1404 | zfcp_port_dequeue(struct zfcp_port *port) | 1404 | zfcp_port_dequeue(struct zfcp_port *port) |
1405 | { | 1405 | { |
1406 | struct fc_port *rport; | ||
1407 | |||
1408 | zfcp_port_wait(port); | 1406 | zfcp_port_wait(port); |
1409 | write_lock_irq(&zfcp_data.config_lock); | 1407 | write_lock_irq(&zfcp_data.config_lock); |
1410 | list_del(&port->list); | 1408 | list_del(&port->list); |
1411 | port->adapter->ports--; | 1409 | port->adapter->ports--; |
1412 | write_unlock_irq(&zfcp_data.config_lock); | 1410 | write_unlock_irq(&zfcp_data.config_lock); |
1413 | if (port->rport) | 1411 | if (port->rport) |
1414 | fc_remote_port_delete(rport); | 1412 | fc_remote_port_delete(port->rport); |
1413 | port->rport = NULL; | ||
1415 | zfcp_adapter_put(port->adapter); | 1414 | zfcp_adapter_put(port->adapter); |
1416 | zfcp_sysfs_port_remove_files(&port->sysfs_device, | 1415 | zfcp_sysfs_port_remove_files(&port->sysfs_device, |
1417 | atomic_read(&port->status)); | 1416 | atomic_read(&port->status)); |
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index 3c65aedaa97f..b30abab77da3 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
@@ -203,7 +203,7 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device) | |||
203 | { | 203 | { |
204 | struct zfcp_adapter *adapter; | 204 | struct zfcp_adapter *adapter; |
205 | struct zfcp_port *port; | 205 | struct zfcp_port *port; |
206 | struct fc_port *rport; | 206 | struct fc_rport *rport; |
207 | 207 | ||
208 | down(&zfcp_data.config_sema); | 208 | down(&zfcp_data.config_sema); |
209 | adapter = dev_get_drvdata(&ccw_device->dev); | 209 | adapter = dev_get_drvdata(&ccw_device->dev); |