[SCSI] qla2xxx: Free rsp_data even on error in qla2x00_process_loopback()
authorSteve Hodgson <steve@purestorage.com>
Wed, 21 Nov 2012 07:39:56 +0000 (02:39 -0500)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 30 Nov 2012 09:37:48 +0000 (09:37 +0000)
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>
drivers/scsi/qla2xxx/qla_bsg.c

index 05520be..9f34ded 100644 (file)
@@ -743,7 +743,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                                ql_log(ql_log_warn, vha, 0x701f,
                                    "Get port config failed.\n");
                                rval = -EPERM;
-                               goto done_free_dma_req;
+                               goto done_free_dma_rsp;
                        }
 
                        ql_dbg(ql_dbg_user, vha, 0x70c0,
@@ -762,7 +762,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
 
                        if (rval) {
                                rval = -EPERM;
-                               goto done_free_dma_req;
+                               goto done_free_dma_rsp;
                        }
 
                        type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -795,7 +795,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
                                }
 
                                rval = -EIO;
-                               goto done_free_dma_req;
+                               goto done_free_dma_rsp;
                        }
                } else {
                        type = "FC_BSG_HST_VENDOR_LOOPBACK";
@@ -830,6 +830,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
        fw_sts_ptr += sizeof(response);
        *fw_sts_ptr = command_sent;
 
+done_free_dma_rsp:
        dma_free_coherent(&ha->pdev->dev, rsp_data_len,
                rsp_data, rsp_data_dma);
 done_free_dma_req: