projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
kfifo.c
diff --git
a/kernel/kfifo.c
b/kernel/kfifo.c
index 498cabba225e9c90fa37edc1cda2120dbcd27a1f..35edbe22e9a955a1a69cdad290f4861dd76c33e1 100644
(file)
--- a/
kernel/kfifo.c
+++ b/
kernel/kfifo.c
@@
-80,7
+80,7
@@
int kfifo_alloc(struct kfifo *fifo, unsigned int size, gfp_t gfp_mask)
buffer = kmalloc(size, gfp_mask);
if (!buffer) {
- _kfifo_init(fifo,
0
, 0);
+ _kfifo_init(fifo,
NULL
, 0);
return -ENOMEM;
}
@@
-97,6
+97,7
@@
EXPORT_SYMBOL(kfifo_alloc);
void kfifo_free(struct kfifo *fifo)
{
kfree(fifo->buffer);
+ _kfifo_init(fifo, NULL, 0);
}
EXPORT_SYMBOL(kfifo_free);