lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 036/221] SCSI: qla2xxx: Free rsp_data even on error in qla2x00_process_loopback()
    Date
    3.7-stable review patch.  If anyone has any objections, please let me know.

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

    From: Steve Hodgson <steve@purestorage.com>

    commit 9bceab4e08c5e329e9def7fe1cab41c467236517 upstream.

    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>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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:



    \
     
     \ /
      Last update: 2013-01-15 21:02    [W:4.038 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site