git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
2998fe3
..
c89883b
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1768,10
+1768,10
@@
static int __end_that_request_first(struct request *req, int error,
} else {
int idx = bio->bi_idx + next_idx;
} else {
int idx = bio->bi_idx + next_idx;
- if (unlikely(
bio->bi_
idx >= bio->bi_vcnt)) {
+ if (unlikely(idx >= bio->bi_vcnt)) {
blk_dump_rq_flags(req, "__end_that");
printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
blk_dump_rq_flags(req, "__end_that");
printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
- __func__,
bio->bi_
idx, bio->bi_vcnt);
+ __func__, idx, bio->bi_vcnt);
break;
}
break;
}