aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-04-16 12:48:35 -0700
committerBen Hutchings <ben@decadent.org.uk>2015-08-07 00:32:06 +0100
commit0fd0b9f448e1ff459ea4f718def61a197b15bb4c (patch)
treef856d0c539bc61c39a517b28671dfb3294b7c287 /drivers/memstick
parente3f81ba2f0546f030fc234f7aade3016532c75b1 (diff)
downloadkernel_samsung_smdk4412-0fd0b9f448e1ff459ea4f718def61a197b15bb4c.zip
kernel_samsung_smdk4412-0fd0b9f448e1ff459ea4f718def61a197b15bb4c.tar.gz
kernel_samsung_smdk4412-0fd0b9f448e1ff459ea4f718def61a197b15bb4c.tar.bz2
memstick: mspro_block: add missing curly braces
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/core/mspro_block.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 9729b92..f8449d5 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -760,7 +760,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;
@@ -768,6 +768,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);