Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[safe/jmp/linux-2.6] / drivers / uwb / whci.c

diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c
index e626467..b221142 100644 (file)
--- a/drivers/uwb/whci.c
+++ b/drivers/uwb/whci.c
@@ -9,6 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <linux/uwb/whci.h>
 #include <linux/uwb/umc.h>
 
@@ -67,11 +68,11 @@ int whci_wait_for(struct device *dev, u32 __iomem *reg, u32 mask, u32 result,
                val = le_readl(reg);
                if ((val & mask) == result)
                        break;
-               msleep(10);
                if (t >= max_ms) {
-                       dev_err(dev, "timed out waiting for %s ", tag);
+                       dev_err(dev, "%s timed out\n", tag);
                        return -ETIMEDOUT;
                }
+               msleep(10);
                t += 10;
        }
        return 0;
@@ -160,10 +161,10 @@ static int whci_probe(struct pci_dev *pci, const struct pci_device_id *id)
        pci_enable_msi(pci);
        pci_set_master(pci);
        err = -ENXIO;
-       if (!pci_set_dma_mask(pci, DMA_64BIT_MASK))
-               pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
-       else if (!pci_set_dma_mask(pci, DMA_32BIT_MASK))
-               pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK);
+       if (!pci_set_dma_mask(pci, DMA_BIT_MASK(64)))
+               pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64));
+       else if (!pci_set_dma_mask(pci, DMA_BIT_MASK(32)))
+               pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32));
        else
                goto error_dma;