bcma: invalidate the mapped core over suspend/resume
authorRafał Miłecki <zajec5@gmail.com>
Fri, 13 Jan 2012 22:58:38 +0000 (23:58 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 Jan 2012 20:01:15 +0000 (15:01 -0500)
This clears the currently mapped core when suspending, to force
re-mapping after resume. Without that we were touching default core
registers believing some other core is mapped. Such a behaviour
resulted in lockups on some machines.

Cc: stable@vger.kernel.org
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/bcma/host_pci.c

index 443b83a2fd7aa012c1c6835137e2642a79499b41..c1ca9e3ada5c3737437c4088e33b47918b2d5157 100644 (file)
@@ -237,11 +237,14 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
 #ifdef CONFIG_PM
 static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)
 {
+       struct bcma_bus *bus = pci_get_drvdata(dev);
+
        /* Host specific */
        pci_save_state(dev);
        pci_disable_device(dev);
        pci_set_power_state(dev, pci_choose_state(dev, state));
 
+       bus->mapped_core = NULL;
        return 0;
 }