aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorSteve Hodgson <steve@purestorage.com>2012-11-21 02:39:56 -0500
committerJames Bottomley <JBottomley@Parallels.com>2012-11-30 04:37:48 -0500
commit9bceab4e08c5e329e9def7fe1cab41c467236517 (patch)
tree4340bff8647454baa537a96bc6420263bdfbed08 /drivers/scsi
parent220d36b4c2d96446e88d561714829ec5801b4fc7 (diff)
[SCSI] qla2xxx: Free rsp_data even on error in qla2x00_process_loopback()
Signed-off-by: Steve Hodgson <steve@purestorage.com> Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Cc: <stable@vger.kernel.org> #3.7 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 05520be511b6..9f34dedcdad7 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -743,7 +743,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
743 ql_log(ql_log_warn, vha, 0x701f, 743 ql_log(ql_log_warn, vha, 0x701f,
744 "Get port config failed.\n"); 744 "Get port config failed.\n");
745 rval = -EPERM; 745 rval = -EPERM;
746 goto done_free_dma_req; 746 goto done_free_dma_rsp;
747 } 747 }
748 748
749 ql_dbg(ql_dbg_user, vha, 0x70c0, 749 ql_dbg(ql_dbg_user, vha, 0x70c0,
@@ -762,7 +762,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
762 762
763 if (rval) { 763 if (rval) {
764 rval = -EPERM; 764 rval = -EPERM;
765 goto done_free_dma_req; 765 goto done_free_dma_rsp;
766 } 766 }
767 767
768 type = "FC_BSG_HST_VENDOR_LOOPBACK"; 768 type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -795,7 +795,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
795 } 795 }
796 796
797 rval = -EIO; 797 rval = -EIO;
798 goto done_free_dma_req; 798 goto done_free_dma_rsp;
799 } 799 }
800 } else { 800 } else {
801 type = "FC_BSG_HST_VENDOR_LOOPBACK"; 801 type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -830,6 +830,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
830 fw_sts_ptr += sizeof(response); 830 fw_sts_ptr += sizeof(response);
831 *fw_sts_ptr = command_sent; 831 *fw_sts_ptr = command_sent;
832 832
833done_free_dma_rsp:
833 dma_free_coherent(&ha->pdev->dev, rsp_data_len, 834 dma_free_coherent(&ha->pdev->dev, rsp_data_len,
834 rsp_data, rsp_data_dma); 835 rsp_data, rsp_data_dma);
835done_free_dma_req: 836done_free_dma_req: