diff options
Diffstat (limited to 'drivers/bcma/host_pci.c')
-rw-r--r-- | drivers/bcma/host_pci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index e3928d68802b..6c05cf470f96 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c | |||
@@ -201,6 +201,9 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev, | |||
201 | bus->hosttype = BCMA_HOSTTYPE_PCI; | 201 | bus->hosttype = BCMA_HOSTTYPE_PCI; |
202 | bus->ops = &bcma_host_pci_ops; | 202 | bus->ops = &bcma_host_pci_ops; |
203 | 203 | ||
204 | bus->boardinfo.vendor = bus->host_pci->subsystem_vendor; | ||
205 | bus->boardinfo.type = bus->host_pci->subsystem_device; | ||
206 | |||
204 | /* Register */ | 207 | /* Register */ |
205 | err = bcma_bus_register(bus); | 208 | err = bcma_bus_register(bus); |
206 | if (err) | 209 | if (err) |
@@ -222,7 +225,7 @@ err_kfree_bus: | |||
222 | return err; | 225 | return err; |
223 | } | 226 | } |
224 | 227 | ||
225 | static void bcma_host_pci_remove(struct pci_dev *dev) | 228 | static void __devexit bcma_host_pci_remove(struct pci_dev *dev) |
226 | { | 229 | { |
227 | struct bcma_bus *bus = pci_get_drvdata(dev); | 230 | struct bcma_bus *bus = pci_get_drvdata(dev); |
228 | 231 | ||
@@ -277,7 +280,7 @@ static struct pci_driver bcma_pci_bridge_driver = { | |||
277 | .name = "bcma-pci-bridge", | 280 | .name = "bcma-pci-bridge", |
278 | .id_table = bcma_pci_bridge_tbl, | 281 | .id_table = bcma_pci_bridge_tbl, |
279 | .probe = bcma_host_pci_probe, | 282 | .probe = bcma_host_pci_probe, |
280 | .remove = bcma_host_pci_remove, | 283 | .remove = __devexit_p(bcma_host_pci_remove), |
281 | .driver.pm = BCMA_PM_OPS, | 284 | .driver.pm = BCMA_PM_OPS, |
282 | }; | 285 | }; |
283 | 286 | ||