projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
[powerpc.git]
/
drivers
/
char
/
n_r3964.c
diff --git
a/drivers/char/n_r3964.c
b/drivers/char/n_r3964.c
index
c48de09
..
203dc2b
100644
(file)
--- a/
drivers/char/n_r3964.c
+++ b/
drivers/char/n_r3964.c
@@
-951,7
+951,8
@@
static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
{
queue_the_message:
- pMsg = kmalloc(sizeof(struct r3964_message), GFP_KERNEL);
+ pMsg = kmalloc(sizeof(struct r3964_message),
+ error_code?GFP_ATOMIC:GFP_KERNEL);
TRACE_M("add_msg - kmalloc %p",pMsg);
if(pMsg==NULL) {
return;