Merge tag 'pstore-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[mv-sheeva.git] / drivers / bcma / host_pci.c

diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 86dfeea77e1aa4b8c36a74ec0e0906717cefd977..e3928d68802b2ba0c283a1eca2fe0bc86bea40be 100644 (file)
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -154,8 +154,8 @@ const struct bcma_host_ops bcma_host_pci_ops = {
        .awrite32       = bcma_host_pci_awrite32,
 };
 
-static int bcma_host_pci_probe(struct pci_dev *dev,
-                            const struct pci_device_id *id)
+static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *id)
 {
        struct bcma_bus *bus;
        int err = -ENOMEM;
@@ -242,7 +242,7 @@ static int bcma_host_pci_suspend(struct device *dev)
 
        bus->mapped_core = NULL;
 
-       return 0;
+       return bcma_bus_suspend(bus);
 }
 
 static int bcma_host_pci_resume(struct device *dev)