diff --git a/[refs] b/[refs] index 491105711e33..507531f5be52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76832d8416430d6dd0575579ca1e00d1a790f4cb +refs/heads/master: 794e64d5e9c7f088378e093a48eb36a30091d82d diff --git a/trunk/drivers/block/umem.c b/trunk/drivers/block/umem.c index 99806f9ee4ce..5f5095afb06b 100644 --- a/trunk/drivers/block/umem.c +++ b/trunk/drivers/block/umem.c @@ -484,7 +484,8 @@ static void process_page(unsigned long data) page->idx++; if (page->idx >= bio->bi_vcnt) { page->bio = bio->bi_next; - page->idx = page->bio->bi_idx; + if (page->bio) + page->idx = page->bio->bi_idx; } pci_unmap_page(card->dev, desc->data_dma_handle,