From 2ecac9c71ffb478ff9eb3b5565567084951c3fd4 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 8 May 2012 17:27:32 -0600 Subject: [PATCH] --- yaml --- r: 306786 b: refs/heads/master c: dfcfb545d7edd0542c187c948237006675c4a656 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3906b672b983..db5252d4ca97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2615f3759b7b7d47a2fa894bc9f45286bdf122d7 +refs/heads/master: dfcfb545d7edd0542c187c948237006675c4a656 diff --git a/trunk/drivers/net/wireless/b43/dma.c b/trunk/drivers/net/wireless/b43/dma.c index b5f1b91002bb..777cd74921d7 100644 --- a/trunk/drivers/net/wireless/b43/dma.c +++ b/trunk/drivers/net/wireless/b43/dma.c @@ -1109,7 +1109,7 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev, #ifdef CONFIG_B43_SSB if (dev->dev->bus_type == B43_BUS_SSB && dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI && - !(dev->dev->sdev->bus->host_pci->is_pcie && + !(pci_is_pcie(dev->dev->sdev->bus->host_pci) && ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64)) return 1; #endif