lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 171/180] memstick: mspro_block: add missing curly braces
    Date
    3.16.7-ckt11 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 13f6b191aaa11c7fd718d35a0c565f3c16bc1d99 upstream.

    Using the indenting we can see the curly braces were obviously intended.
    This is a static checker fix, but my guess is that we don't read enough
    bytes, because we don't calculate "t_len" correctly.

    Fixes: f1d82698029b ('memstick: use fully asynchronous request processing')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Cc: Alex Dubov <oakad@yahoo.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/memstick/core/mspro_block.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
    index fc145d202c46..922a750640e8 100644
    --- a/drivers/memstick/core/mspro_block.c
    +++ b/drivers/memstick/core/mspro_block.c
    @@ -758,7 +758,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)

    if (error || (card->current_mrq.tpc == MSPRO_CMD_STOP)) {
    if (msb->data_dir == READ) {
    - for (cnt = 0; cnt < msb->current_seg; cnt++)
    + for (cnt = 0; cnt < msb->current_seg; cnt++) {
    t_len += msb->req_sg[cnt].length
    / msb->page_size;

    @@ -766,6 +766,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
    t_len += msb->current_page - 1;

    t_len *= msb->page_size;
    + }
    }
    } else
    t_len = blk_rq_bytes(msb->block_req);

    \
     
     \ /
      Last update: 2015-05-07 12:21    [W:4.023 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site