|
@@ -1583,7 +1583,7 @@ out:
|
|
|
int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)
|
|
|
{
|
|
|
struct zfcp_qdio *qdio = wka_port->adapter->qdio;
|
|
|
- struct zfcp_fsf_req *req = NULL;
|
|
|
+ struct zfcp_fsf_req *req;
|
|
|
int retval = -EIO;
|
|
|
|
|
|
spin_lock_irq(&qdio->req_q_lock);
|
|
@@ -1612,7 +1612,7 @@ int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)
|
|
|
zfcp_fsf_req_free(req);
|
|
|
out:
|
|
|
spin_unlock_irq(&qdio->req_q_lock);
|
|
|
- if (req && !IS_ERR(req))
|
|
|
+ if (!retval)
|
|
|
zfcp_dbf_rec_run_wka("fsowp_1", wka_port, req->req_id);
|
|
|
return retval;
|
|
|
}
|
|
@@ -1638,7 +1638,7 @@ static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)
|
|
|
int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)
|
|
|
{
|
|
|
struct zfcp_qdio *qdio = wka_port->adapter->qdio;
|
|
|
- struct zfcp_fsf_req *req = NULL;
|
|
|
+ struct zfcp_fsf_req *req;
|
|
|
int retval = -EIO;
|
|
|
|
|
|
spin_lock_irq(&qdio->req_q_lock);
|
|
@@ -1667,7 +1667,7 @@ int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)
|
|
|
zfcp_fsf_req_free(req);
|
|
|
out:
|
|
|
spin_unlock_irq(&qdio->req_q_lock);
|
|
|
- if (req && !IS_ERR(req))
|
|
|
+ if (!retval)
|
|
|
zfcp_dbf_rec_run_wka("fscwp_1", wka_port, req->req_id);
|
|
|
return retval;
|
|
|
}
|