aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-04-16 15:48:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-17 09:04:09 -0400
commit13f6b191aaa11c7fd718d35a0c565f3c16bc1d99 (patch)
tree06ec4cbad3eb68146196f47fb200d42c08728d1b
parentc3fe5872eb3f5f9e027d61d8a3f5d092168fdbca (diff)
memstick: mspro_block: add missing curly braces
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>
-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 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)
758 758
759 if (error || (card->current_mrq.tpc == MSPRO_CMD_STOP)) { 759 if (error || (card->current_mrq.tpc == MSPRO_CMD_STOP)) {
760 if (msb->data_dir == READ) { 760 if (msb->data_dir == READ) {
761 for (cnt = 0; cnt < msb->current_seg; cnt++) 761 for (cnt = 0; cnt < msb->current_seg; cnt++) {
762 t_len += msb->req_sg[cnt].length 762 t_len += msb->req_sg[cnt].length
763 / msb->page_size; 763 / msb->page_size;
764 764
@@ -766,6 +766,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
766 t_len += msb->current_page - 1; 766 t_len += msb->current_page - 1;
767 767
768 t_len *= msb->page_size; 768 t_len *= msb->page_size;
769 }
769 } 770 }
770 } else 771 } else
771 t_len = blk_rq_bytes(msb->block_req); 772 t_len = blk_rq_bytes(msb->block_req);