diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-01-13 23:58:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 16:13:50 -0800 |
commit | c893fe01b35036f062a9c7d7f6b7fc926fc91115 (patch) | |
tree | fa9b11b5157e3f8c36bae0b013d4dda3cab64052 | |
parent | 8967b2b814f94a752b65e672e79c065887fe005f (diff) | |
download | lwn-c893fe01b35036f062a9c7d7f6b7fc926fc91115.tar.gz lwn-c893fe01b35036f062a9c7d7f6b7fc926fc91115.zip |
bcma: invalidate the mapped core over suspend/resume
commit 28e7d218da975f6ae1751e293aed938952c55c98 upstream.
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.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 990f5a8e9c19..48e06be8bb59 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c @@ -227,11 +227,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; } |