diff options
Diffstat (limited to 'arch/powerpc/sysdev/axonram.c')
-rw-r--r-- | arch/powerpc/sysdev/axonram.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index d2b79bc336c1..7a399b4d60a0 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c | |||
@@ -103,7 +103,7 @@ axon_ram_irq_handler(int irq, void *dev) | |||
103 | * axon_ram_make_request - make_request() method for block device | 103 | * axon_ram_make_request - make_request() method for block device |
104 | * @queue, @bio: see blk_queue_make_request() | 104 | * @queue, @bio: see blk_queue_make_request() |
105 | */ | 105 | */ |
106 | static void | 106 | static blk_qc_t |
107 | axon_ram_make_request(struct request_queue *queue, struct bio *bio) | 107 | axon_ram_make_request(struct request_queue *queue, struct bio *bio) |
108 | { | 108 | { |
109 | struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data; | 109 | struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data; |
@@ -120,7 +120,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) | |||
120 | bio_for_each_segment(vec, bio, iter) { | 120 | bio_for_each_segment(vec, bio, iter) { |
121 | if (unlikely(phys_mem + vec.bv_len > phys_end)) { | 121 | if (unlikely(phys_mem + vec.bv_len > phys_end)) { |
122 | bio_io_error(bio); | 122 | bio_io_error(bio); |
123 | return; | 123 | return BLK_QC_T_NONE; |
124 | } | 124 | } |
125 | 125 | ||
126 | user_mem = page_address(vec.bv_page) + vec.bv_offset; | 126 | user_mem = page_address(vec.bv_page) + vec.bv_offset; |
@@ -133,6 +133,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) | |||
133 | transfered += vec.bv_len; | 133 | transfered += vec.bv_len; |
134 | } | 134 | } |
135 | bio_endio(bio); | 135 | bio_endio(bio); |
136 | return BLK_QC_T_NONE; | ||
136 | } | 137 | } |
137 | 138 | ||
138 | /** | 139 | /** |