From 260e5066c61e2ee31632742924b29c6820bbd3f0 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 1 Oct 2010 14:19:55 -0700
Subject: [PATCH] --- yaml --- r: 220084 b: refs/heads/master c:
 7e24cce38a99f373450db67bf576fe73e8168d66 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/zram/zram_drv.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 847575517701..142de4467274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80302977017e5cbb12fdf843e5a070ad5d11e3a
+refs/heads/master: 7e24cce38a99f373450db67bf576fe73e8168d66
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index c5f84ee3d28a..72f1b9ce577b 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -435,6 +435,12 @@ static int zram_make_request(struct request_queue *queue, struct bio *bio)
 	int ret = 0;
 	struct zram *zram = queue->queuedata;
 
+	if (unlikely(!zram->init_done)) {
+		set_bit(BIO_UPTODATE, &bio->bi_flags);
+		bio_endio(bio, 0);
+		return 0;
+	}
+
 	if (!valid_io_request(zram, bio)) {
 		zram_stat64_inc(zram, &zram->stats.invalid_io);
 		bio_io_error(bio);