projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
irda
/
irlap_frame.c
diff --git
a/net/irda/irlap_frame.c
b/net/irda/irlap_frame.c
index 8c004161a843a2e33a963ddd254c4a0e5a129969..9ea0c933b9ff8803c071367bfef0df210090a90f 100644
(file)
--- a/
net/irda/irlap_frame.c
+++ b/
net/irda/irlap_frame.c
@@
-544,7
+544,7
@@
static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
/*
* We now have some discovery info to deliver!
*/
- discovery = k
m
alloc(sizeof(discovery_t), GFP_ATOMIC);
+ discovery = k
z
alloc(sizeof(discovery_t), GFP_ATOMIC);
if (!discovery) {
IRDA_WARNING("%s: unable to malloc!\n", __func__);
return;