diff options
Diffstat (limited to 'drivers/scsi/libfc/fc_fcp.c')
-rw-r--r-- | drivers/scsi/libfc/fc_fcp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index 28bfe1c2c50a..a67f53a5026c 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
@@ -1051,7 +1051,6 @@ static int fc_fcp_cmd_send(struct fc_lport *lp, struct fc_fcp_pkt *fsp, | |||
1051 | 1051 | ||
1052 | seq = lp->tt.exch_seq_send(lp, fp, resp, fc_fcp_pkt_destroy, fsp, 0); | 1052 | seq = lp->tt.exch_seq_send(lp, fp, resp, fc_fcp_pkt_destroy, fsp, 0); |
1053 | if (!seq) { | 1053 | if (!seq) { |
1054 | fc_frame_free(fp); | ||
1055 | rc = -1; | 1054 | rc = -1; |
1056 | goto unlock; | 1055 | goto unlock; |
1057 | } | 1056 | } |
@@ -1316,7 +1315,6 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp) | |||
1316 | fc_fcp_pkt_hold(fsp); /* hold while REC outstanding */ | 1315 | fc_fcp_pkt_hold(fsp); /* hold while REC outstanding */ |
1317 | return; | 1316 | return; |
1318 | } | 1317 | } |
1319 | fc_frame_free(fp); | ||
1320 | retry: | 1318 | retry: |
1321 | if (fsp->recov_retry++ < FC_MAX_RECOV_RETRY) | 1319 | if (fsp->recov_retry++ < FC_MAX_RECOV_RETRY) |
1322 | fc_fcp_timer_set(fsp, FC_SCSI_REC_TOV); | 1320 | fc_fcp_timer_set(fsp, FC_SCSI_REC_TOV); |
@@ -1564,10 +1562,9 @@ static void fc_fcp_srr(struct fc_fcp_pkt *fsp, enum fc_rctl r_ctl, u32 offset) | |||
1564 | 1562 | ||
1565 | seq = lp->tt.exch_seq_send(lp, fp, fc_fcp_srr_resp, NULL, | 1563 | seq = lp->tt.exch_seq_send(lp, fp, fc_fcp_srr_resp, NULL, |
1566 | fsp, jiffies_to_msecs(FC_SCSI_REC_TOV)); | 1564 | fsp, jiffies_to_msecs(FC_SCSI_REC_TOV)); |
1567 | if (!seq) { | 1565 | if (!seq) |
1568 | fc_frame_free(fp); | ||
1569 | goto retry; | 1566 | goto retry; |
1570 | } | 1567 | |
1571 | fsp->recov_seq = seq; | 1568 | fsp->recov_seq = seq; |
1572 | fsp->xfer_len = offset; | 1569 | fsp->xfer_len = offset; |
1573 | fsp->xfer_contig_end = offset; | 1570 | fsp->xfer_contig_end = offset; |