From 58638fa3b056379acddd68b66c172fd4ea9c3ec1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 16 Jun 2007 10:16:03 -0700
Subject: [PATCH] --- yaml --- r: 57839 b: refs/heads/master c:
 2f41dddbbd7193fb5cdae0a24db4d378d56885fd h: refs/heads/master i:   57837:
 2ffc3862eeffee906517a5c9e31647c81ac18cb3   57835:
 21dd878598f0e7d64ff853cb423ec3409dee630d   57831:
 44d8a3b227a87ee637875d35db13833e1214f3f0   57823:
 3b4a44975d053c0cb9345af662d2500649d8fd07 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/user.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1096c5cc6bd..fd5abfaff3da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1d93de3e4633c4cbfd622a3564d8268a116a46a
+refs/heads/master: 2f41dddbbd7193fb5cdae0a24db4d378d56885fd
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index 24d7d78e6f42..d65305b515b1 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -99,6 +99,8 @@ static ssize_t snapshot_read(struct file *filp, char __user *buf,
 	ssize_t res;
 
 	data = filp->private_data;
+	if (!data->ready)
+		return -ENODATA;
 	res = snapshot_read_next(&data->handle, count);
 	if (res > 0) {
 		if (copy_to_user(buf, data_of(data->handle), res))
@@ -245,7 +247,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 		break;
 
 	case SNAPSHOT_UNFREEZE:
-		if (!data->frozen)
+		if (!data->frozen || data->ready)
 			break;
 		mutex_lock(&pm_mutex);
 		thaw_processes();