Re: [PATCH] Power Hibernate: hibernation_ops->leave should be checked as well.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Friday, November 26, 2010, MyungJoo Ham wrote:
> Because hibernate calls hibernation_ops->leave() without checking
> whether hibernation_ops->leave is NULL or not, hiberantion_set_ops
> should WARN_ON if hibernation_ops->leave is NULL.
> 
> This patch added one more condition to check hibernation_ops->leave.

Applied to suspend-2.6/linux-next.

Thanks,
Rafael


> Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
>  kernel/power/hibernate.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index 8dc31e0..e6c498d 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -61,7 +61,7 @@ void hibernation_set_ops(struct platform_hibernation_ops *ops)
>  {
>  	if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
>  	    && ops->prepare && ops->finish && ops->enter && ops->pre_restore
> -	    && ops->restore_cleanup)) {
> +	    && ops->restore_cleanup && ops->leave)) {
>  		WARN_ON(1);
>  		return;
>  	}
> 

_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm


[Index of Archives]     [Linux ACPI]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [CPU Freq]     [Kernel Newbies]     [Fedora Kernel]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux