diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 20:47:54 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 20:47:54 (GMT) |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/net/wireless/b43/sdio.c | |
| parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
| parent | daf8cf608d57a0b9f22276036e420cc82cf6ab4f (diff) | |
| download | linux-fsl-qoriq-31ec97d9cebac804814de298592648f7c18d8281.tar.xz | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/b43/sdio.c')
| -rw-r--r-- | drivers/net/wireless/b43/sdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c index 09e2dfd..808e25b 100644 --- a/drivers/net/wireless/b43/sdio.c +++ b/drivers/net/wireless/b43/sdio.c @@ -66,7 +66,7 @@ static void b43_sdio_interrupt_dispatcher(struct sdio_func *func) int b43_sdio_request_irq(struct b43_wldev *dev, void (*handler)(struct b43_wldev *dev)) { - struct ssb_bus *bus = dev->dev->bus; + struct ssb_bus *bus = dev->sdev->bus; struct sdio_func *func = bus->host_sdio; struct b43_sdio *sdio = sdio_get_drvdata(func); int err; @@ -82,7 +82,7 @@ int b43_sdio_request_irq(struct b43_wldev *dev, void b43_sdio_free_irq(struct b43_wldev *dev) { - struct ssb_bus *bus = dev->dev->bus; + struct ssb_bus *bus = dev->sdev->bus; struct sdio_func *func = bus->host_sdio; struct b43_sdio *sdio = sdio_get_drvdata(func); |