Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-beck.git] / drivers / net / wireless / iwlegacy / common.h

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 728aa1306ab8956d19036836b2f4831b873ad7c0..f8246f2d88f9baf0cbb006621fbfbc3845966e26 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -2231,9 +2231,8 @@ il_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)
                return -EINVAL;
        }
 
-       desc->v_addr =
-           dma_alloc_coherent(&pci_dev->dev, desc->len, &desc->p_addr,
-                              GFP_KERNEL);
+       desc->v_addr = dma_alloc_coherent(&pci_dev->dev, desc->len,
+                                         &desc->p_addr, GFP_KERNEL);
        return (desc->v_addr != NULL) ? 0 : -ENOMEM;
 }