diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-09-14 22:42:11 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 22:42:11 +0200 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /drivers/block/umem.c | |
| parent | ARM: omap2plus_defconfig: Enable MUSB DMA support (diff) | |
| parent | ARM: dts: Fixup model name for HP t410 dts (diff) | |
| download | linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz linux-7168e947291f0ead07e5638b4599fb7845288b69.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'drivers/block/umem.c')
| -rw-r--r-- | drivers/block/umem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 4cf81b5bf0f7..04d65790a886 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -456,7 +456,7 @@ static void process_page(unsigned long data) PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); if (control & DMASCR_HARD_ERROR) { /* error */ - clear_bit(BIO_UPTODATE, &bio->bi_flags); + bio->bi_error = -EIO; dev_printk(KERN_WARNING, &card->dev->dev, "I/O error on sector %d/%d\n", le32_to_cpu(desc->local_addr)>>9, @@ -505,7 +505,7 @@ static void process_page(unsigned long data) return_bio = bio->bi_next; bio->bi_next = NULL; - bio_endio(bio, 0); + bio_endio(bio); } } @@ -531,6 +531,8 @@ static void mm_make_request(struct request_queue *q, struct bio *bio) (unsigned long long)bio->bi_iter.bi_sector, bio->bi_iter.bi_size); + blk_queue_split(q, &bio, q->bio_split); + spin_lock_irq(&card->lock); *card->biotail = bio; bio->bi_next = NULL; |