aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/dsp_pipeline.c
diff options
context:
space:
mode:
authorAndreas Eversberg <andreas@eversberg.eu>2008-10-11 08:13:29 +0200
committerKarsten Keil <kkeil@suse.de>2009-01-09 22:44:29 +0100
commit400fd9783e7374bdf73b9cee9d7b90e35e3007da (patch)
treea91634d74632c2326094fc055f1e77f5aa9c7533 /drivers/isdn/mISDN/dsp_pipeline.c
parentmISDN: Create /sys/class/mISDN (diff)
downloadlinux-dev-400fd9783e7374bdf73b9cee9d7b90e35e3007da.tar.xz
linux-dev-400fd9783e7374bdf73b9cee9d7b90e35e3007da.zip
mISDN: Minor cleanups
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu> Signed-off-by: Karsten Keil <kkeil@suse.de>
Diffstat (limited to '')
-rw-r--r--drivers/isdn/mISDN/dsp_pipeline.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 7a3a3e1e4d80..bf999bdc41c3 100644
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -92,7 +92,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
if (!elem)
return -EINVAL;
- entry = kzalloc(sizeof(struct dsp_element_entry), GFP_KERNEL);
+ entry = kzalloc(sizeof(struct dsp_element_entry), GFP_ATOMIC);
if (!entry)
return -ENOMEM;
@@ -253,7 +253,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
if (!len)
return 0;
- dup = kmalloc(len + 1, GFP_KERNEL);
+ dup = kmalloc(len + 1, GFP_ATOMIC);
if (!dup)
return 0;
strcpy(dup, cfg);
@@ -270,7 +270,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
elem = entry->elem;
pipeline_entry = kmalloc(sizeof(struct
- dsp_pipeline_entry), GFP_KERNEL);
+ dsp_pipeline_entry), GFP_ATOMIC);
if (!pipeline_entry) {
printk(KERN_ERR "%s: failed to add "
"entry to pipeline: %s (out of "