projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/users/willy/linux-nvme
[cascardo/linux.git]
/
drivers
/
net
/
irda
/
w83977af_ir.c
diff --git
a/drivers/net/irda/w83977af_ir.c
b/drivers/net/irda/w83977af_ir.c
index
bb8857a
..
e641bb2
100644
(file)
--- a/
drivers/net/irda/w83977af_ir.c
+++ b/
drivers/net/irda/w83977af_ir.c
@@
-215,16
+215,16
@@
static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
/* Allocate memory if needed */
self->rx_buff.head =
/* Allocate memory if needed */
self->rx_buff.head =
- dma_alloc_coherent(NULL, self->rx_buff.truesize,
-
&self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO
);
+ dma_
z
alloc_coherent(NULL, self->rx_buff.truesize,
+
&self->rx_buff_dma, GFP_KERNEL
);
if (self->rx_buff.head == NULL) {
err = -ENOMEM;
goto err_out1;
}
self->tx_buff.head =
if (self->rx_buff.head == NULL) {
err = -ENOMEM;
goto err_out1;
}
self->tx_buff.head =
- dma_alloc_coherent(NULL, self->tx_buff.truesize,
-
&self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO
);
+ dma_
z
alloc_coherent(NULL, self->tx_buff.truesize,
+
&self->tx_buff_dma, GFP_KERNEL
);
if (self->tx_buff.head == NULL) {
err = -ENOMEM;
goto err_out2;
if (self->tx_buff.head == NULL) {
err = -ENOMEM;
goto err_out2;