3.7-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Steve Hodgson <[email protected]>

commit 9bceab4e08c5e329e9def7fe1cab41c467236517 upstream.

Signed-off-by: Steve Hodgson <[email protected]>
Signed-off-by: Armen Baloyan <[email protected]>
Signed-off-by: Saurav Kashyap <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/scsi/qla2xxx/qla_bsg.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -743,7 +743,7 @@ qla2x00_process_loopback(struct fc_bsg_j
                                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_j
 
                        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_j
                                }
 
                                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_j
        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:


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to