Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24038
b: refs/heads/master
c: e655a25
h: refs/heads/master
v: v3
  • Loading branch information
Con Kolivas authored and Linus Torvalds committed Mar 26, 2006
1 parent 0818afd commit 5dac1f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f4fd61fa7c13ea905dac18b9baa766a35b88485
refs/heads/master: e655a250d5fc12b6dfe0d436180ba4a3bfffdc9f
7 changes: 4 additions & 3 deletions trunk/kernel/power/swap.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,11 @@ static int load_image(struct swap_map_handle *handle,
nr_pages++;
}
} while (ret > 0);
if (!error)
if (!error) {
printk("\b\b\b\bdone\n");
if (!snapshot_image_loaded(snapshot))
error = -ENODATA;
if (!snapshot_image_loaded(snapshot))
error = -ENODATA;
}
return error;
}

Expand Down

0 comments on commit 5dac1f5

Please sign in to comment.