---

yaml --- r: 57839 b: refs/heads/master c: 2f41ddd h: refs/heads/master i: 57837: 2ffc386 57835: 21dd878 57831: 44d8a3b 57823: 3b4a449 v: v3
git-mirror · Jun 16, 2007 · 58638fa · 58638fa
1 parent fbe47da
commit 58638fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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();