From f7fe12b4e0fa60fbfdc4fe2daac4046ae1db36d0 Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com>
Date: Fri, 17 Dec 2010 17:03:15 +0100
Subject: [PATCH] --- yaml --- r: 235616 b: refs/heads/master c:
 1aa326640d1e91d32179310441fa3030c501d0f3 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/zram/zram_drv.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b7b1c5c85089..99cada7031d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2da98739da4e20e907f8317d513868764002d31
+refs/heads/master: 1aa326640d1e91d32179310441fa3030c501d0f3
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index 0ab931e9ee7e..01d6dd952581 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -208,8 +208,7 @@ static int zram_read(struct zram *zram, struct bio *bio)
 	struct bio_vec *bvec;
 
 	if (unlikely(!zram->init_done)) {
-		set_bit(BIO_UPTODATE, &bio->bi_flags);
-		bio_endio(bio, 0);
+		bio_endio(bio, -ENXIO);
 		return 0;
 	}