diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:17:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:19:06 +0800 |
| commit | bd4e9a26373331ef6f185500c72a8836eb7c82d9 (patch) | |
| tree | 13384e7649be7bb88ab9524efcbc602be85d5020 /drivers/memstick/core/mspro_block.c | |
| parent | 2528dbd348dd541e090594b7aac3f62351078388 (diff) | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.07-android
Conflicts:
fs/exec.c
Solutions:
follow commit d221244a7
sched: move no_new_privs into new atomic flags
to use task_no_new_privs(current).
Diffstat (limited to 'drivers/memstick/core/mspro_block.c')
| -rw-r--r-- | drivers/memstick/core/mspro_block.c | 3 |
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) 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); |