From: Rafał Miłecki Date: Fri, 13 Jan 2012 22:58:38 +0000 (+0100) Subject: bcma: invalidate the mapped core over suspend/resume X-Git-Tag: v3.2.2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c893fe01b35036f062a9c7d7f6b7fc926fc91115;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index 990f5a8..48e06be 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; }