projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
wireless
/
iwlegacy
/
4965-mac.c
diff --git
a/drivers/net/wireless/iwlegacy/4965-mac.c
b/drivers/net/wireless/iwlegacy/4965-mac.c
index
289701e
..
9a95045
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/
drivers/net/wireless/iwlegacy/4965-mac.c
@@
-1921,8
+1921,8
@@
drop_unlock:
static inline int
il4965_alloc_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr, size_t size)
{
static inline int
il4965_alloc_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr, size_t size)
{
- ptr->addr =
-
dma_alloc_coherent(&il->pci_dev->dev, size, &ptr->dma,
GFP_KERNEL);
+ ptr->addr =
dma_alloc_coherent(&il->pci_dev->dev, size, &ptr->dma,
+
GFP_KERNEL);
if (!ptr->addr)
return -ENOMEM;
ptr->size = size;
if (!ptr->addr)
return -ENOMEM;
ptr->size = size;