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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
irda
/
ircomm
/
ircomm_core.c
diff --git
a/net/irda/ircomm/ircomm_core.c
b/net/irda/ircomm/ircomm_core.c
index 52079f19bbbe4a087efbf0d1e4627a4e6bc8b408..b797daac063c2231efb0dc053bbf51301dae756d 100644
(file)
--- a/
net/irda/ircomm/ircomm_core.c
+++ b/
net/irda/ircomm/ircomm_core.c
@@
-117,7
+117,7
@@
struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line)
IRDA_ASSERT(ircomm != NULL, return NULL;);
- self = kzalloc(sizeof(struct ircomm_cb), GFP_
ATOMIC
);
+ self = kzalloc(sizeof(struct ircomm_cb), GFP_
KERNEL
);
if (self == NULL)
return NULL;