diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-01 13:52:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-01 13:52:03 -0500 |
| commit | 98b7ff9a4977e4f4f451c30288b197ad79e5ab7f (patch) | |
| tree | b0aae5739f08a2c3fd822e2b86dd1a369fd2e0a2 /drivers/bcma | |
| parent | 32fcafbcd1c9f6c7013016a22a5369b4acb93577 (diff) | |
| parent | 466026989f112e0546ca39ab00a759af82dbe83a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/driver_pci_host.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c index d3bde6cec927..30629a3d44cc 100644 --- a/drivers/bcma/driver_pci_host.c +++ b/drivers/bcma/driver_pci_host.c | |||
| @@ -404,6 +404,8 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) | |||
| 404 | return; | 404 | return; |
| 405 | } | 405 | } |
| 406 | 406 | ||
| 407 | spin_lock_init(&pc_host->cfgspace_lock); | ||
| 408 | |||
| 407 | pc->host_controller = pc_host; | 409 | pc->host_controller = pc_host; |
| 408 | pc_host->pci_controller.io_resource = &pc_host->io_resource; | 410 | pc_host->pci_controller.io_resource = &pc_host->io_resource; |
| 409 | pc_host->pci_controller.mem_resource = &pc_host->mem_resource; | 411 | pc_host->pci_controller.mem_resource = &pc_host->mem_resource; |