From: Rafał Miłecki <zajec5@gmail.com>
Date: Fri, 13 Jan 2012 22:58:38 +0000 (+0100)
Subject: bcma: invalidate the mapped core over suspend/resume
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=28e7d218da975f6ae1751e293aed938952c55c98;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

bcma: invalidate the mapped core over suspend/resume

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>
---

diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 443b83a2fd7a..c1ca9e3ada5c 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -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;
 }