diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2012-01-13 23:58:38 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-16 15:01:15 -0500 |
| commit | 28e7d218da975f6ae1751e293aed938952c55c98 (patch) | |
| tree | 82da2fb45b994ca5f4dfd560fa5c71faa7e4a640 | |
| parent | 8675b505a4df40394096948453a17cc5445f6538 (diff) | |
| download | linux-3.10-28e7d218da975f6ae1751e293aed938952c55c98.tar.gz linux-3.10-28e7d218da975f6ae1751e293aed938952c55c98.tar.bz2 linux-3.10-28e7d218da975f6ae1751e293aed938952c55c98.zip | |
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>
| -rw-r--r-- | drivers/bcma/host_pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index 443b83a2fd7..c1ca9e3ada5 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; } |