[linux-pm] [PATCH 2/7] PCI PM: Check if the state has been saved before trying to restore it

Benjamin Herrenschmidt benh at kernel.crashing.org
Tue Feb 3 17:54:26 PST 2009


On Wed, 2009-02-04 at 01:57 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw at sisk.pl>
> 
> Check if the standard configuration registers of a PCI device have
> been saved during suspend before trying to restore them during
> resume.
> 
> Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>

Acked-By: Benjamin Herrenschmidt <benh at kernel.crashing.org>


> ---
>  drivers/pci/pci.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/drivers/pci/pci.c
> ===================================================================
> --- linux-2.6.orig/drivers/pci/pci.c
> +++ linux-2.6/drivers/pci/pci.c
> @@ -1421,7 +1421,7 @@ int pci_restore_standard_config(struct p
>  	dev->current_state = PCI_D0;
>  
>   Restore:
> -	return pci_restore_state(dev);
> +	return dev->state_saved ? pci_restore_state(dev) : 0;
>  }
>  
>  /**



More information about the linux-pm mailing list