The patch titled
Subject: memstick: mspro_block: add missing curly braces
has been added to the -mm tree. Its filename is
memstick-mspro_block-add-missing-curly-braces.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memstick-mspro_block-add-missing-curly-braces.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memstick-mspro_block-add-missing-curly-braces.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Alex Dubov <oakad@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/memstick/core/mspro_block.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/memstick/core/mspro_block.c~memstick-mspro_block-add-missing-curly-braces drivers/memstick/core/mspro_block.c
--- a/drivers/memstick/core/mspro_block.c~memstick-mspro_block-add-missing-curly-braces
+++ a/drivers/memstick/core/mspro_block.c
@@ -758,7 +758,7 @@ static int mspro_block_complete_req(stru
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(stru
t_len += msb->current_page - 1;
t_len *= msb->page_size;
+ }
}
} else
t_len = blk_rq_bytes(msb->block_req);
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
rtc-ds1685-fix-conditional-in-ds1685_rtc_sysfs_time_regs_showstore.patch
memstick-mspro_block-add-missing-curly-braces.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
