On Wednesday 27 January 2010, Jiri Slaby wrote:
> It will never reach here if the sws_resume_bdev is erratic.
> swsusp_read is called only from software_resume, but after
> swsusp_check which would catch the error state.
>
> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
> Cc: Rafael J. Wysocki <rjw@xxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxx>
Applied.
> ---
> kernel/power/swap.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index 09b2b0a..1d57573 100644
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -657,10 +657,6 @@ int swsusp_read(unsigned int *flags_p)
> struct swsusp_info *header;
>
> *flags_p = swsusp_header->flags;
> - if (IS_ERR(resume_bdev)) {
> - pr_debug("PM: Image device not initialised\n");
> - return PTR_ERR(resume_bdev);
> - }
>
> memset(&snapshot, 0, sizeof(struct snapshot_handle));
> error = snapshot_write_next(&snapshot, PAGE_SIZE);
>
Rafael
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
