Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (169 commits)
  commit 78a596b4490e17b9990d87b9d468ef5bb70daa10
  Author: Adrian Bunk <bunk@stusta.de>
  Date:   Fri Mar 31 01:38:12 2006 -0800
  
      [PATCH] remove kernel/power/pm.c:pm_unregister()
      
      Since the last user is removed in -mm, we can now remove this long deprecated
      function.
      
      Signed-off-by: Adrian Bunk <bunk@stusta.de>
      Cc: Pavel Machek <pavel@ucw.cz>
      Signed-off-by: Andrew Morton <akpm@osdl.org>
      Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  commit 21440d313358043b0ce5e43b00ff3c9b35a8616c
  Author: David Brownell <david-b@pacbell.net>
  Date:   Sat Apr 1 10:21:52 2006 -0800
  
      [PATCH] dma doc updates
      
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 042fa5265cf6..2329f941a0dc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -446,6 +446,10 @@ pci_save_state(struct pci_dev *dev)
         /* XXX: 100% dword access ok here? */
         for (i = 0; i < 16; i++)
                 pci_read_config_dword(dev, i * 4,&dev->saved_config_space[i]);
+        if ((i = pci_save_msi_state(dev)) != 0)
+                return i;
+        if ((i = pci_save_msix_state(dev)) != 0)
+                return i;
         return 0;
 }
 
@@ -460,6 +464,8 @@ pci_restore_state(struct pci_dev *dev)
 
         for (i = 0; i < 16; i++)
                 pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
+        pci_restore_msi_state(dev);
+        pci_restore_msix_state(dev);
         return 0;
 }