From 8070e810fe035271bde0b768aece0a29a8123562 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 12 Oct 2007 00:26:34 -0700 Subject: [PATCH] --- yaml --- r: 67601 b: refs/heads/master c: cbd09dbbb62096c1da627eca865f988d2ed0a84e h: refs/heads/master i: 67599: bb3bbe01f8954f74cc5306d56e8686d0e5dd1ddd v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/axonram.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 73f442cdd837..1269c7a8898c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb +refs/heads/master: cbd09dbbb62096c1da627eca865f988d2ed0a84e diff --git a/trunk/arch/powerpc/sysdev/axonram.c b/trunk/arch/powerpc/sysdev/axonram.c index 4d3ba63bba79..5eaf3e3f4b8b 100644 --- a/trunk/arch/powerpc/sysdev/axonram.c +++ b/trunk/arch/powerpc/sysdev/axonram.c @@ -117,7 +117,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) transfered = 0; bio_for_each_segment(vec, bio, idx) { if (unlikely(phys_mem + vec->bv_len > phys_end)) { - bio_io_error(bio, bio->bi_size); + bio_io_error(bio); rc = -ERANGE; break; } @@ -131,7 +131,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) phys_mem += vec->bv_len; transfered += vec->bv_len; } - bio_endio(bio, transfered, 0); + bio_endio(bio, 0); return rc; }