diff options
| author | Konrad Zapalowicz | 2014-08-31 22:42:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-02 19:44:33 +0200 |
| commit | 239d1346f5f77135e272eee0c33cfa3e52fc4e1c (patch) | |
| tree | fc67389ce6fc0c8030c655f1dd9a77e5342b6a87 /drivers/staging/dgnc/dgnc_tty.c | |
| parent | staging: netlogic: Fix checkpatch.pl warning (diff) | |
| download | kernel-qcow2-linux-239d1346f5f77135e272eee0c33cfa3e52fc4e1c.tar.gz kernel-qcow2-linux-239d1346f5f77135e272eee0c33cfa3e52fc4e1c.tar.xz kernel-qcow2-linux-239d1346f5f77135e272eee0c33cfa3e52fc4e1c.zip | |
staging: dgnc: Fix sleeping under spinlock bug
This commit changes the memory allocation flags to ATOMIC in order to
avoid sleeping in the nowait/nolock code.
Signed-off-by: Konrad Zapalowicz <bergo.torino+kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgnc/dgnc_tty.c')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index afb20a3e13ab..a798476cf4ea 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -462,7 +462,7 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int char *p; int too_much_data; - tmpbuf = kzalloc(TMPBUFLEN, GFP_KERNEL); + tmpbuf = kzalloc(TMPBUFLEN, GFP_ATOMIC); if (!tmpbuf) return; p = tmpbuf; |