diff options
author | Jan Kiszka <jan.kiszka@web.de> | 2010-02-08 05:12:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-16 19:01:24 -0500 |
commit | 54f0fad3d8414cf770c1cf25a1d98fcaec899b5a (patch) | |
tree | b75cfc27c4a3dd0e3516fe35de9273df1b6f5da3 /drivers/isdn/capi | |
parent | 05b4149433ffae789edaf569da8d998c93eed1aa (diff) |
CAPI: Use non-atomic allocation during NCCI setup
Both capincci_alloc and capiminor_alloc run in non-atomic context,
update their memory allocations accordingly.
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/capi')
-rw-r--r-- | drivers/isdn/capi/capi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 403bf8fcb285..f8f86602c57e 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
@@ -217,7 +217,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci) | |||
217 | unsigned int minor = 0; | 217 | unsigned int minor = 0; |
218 | unsigned long flags; | 218 | unsigned long flags; |
219 | 219 | ||
220 | mp = kzalloc(sizeof(*mp), GFP_ATOMIC); | 220 | mp = kzalloc(sizeof(*mp), GFP_KERNEL); |
221 | if (!mp) { | 221 | if (!mp) { |
222 | printk(KERN_ERR "capi: can't alloc capiminor\n"); | 222 | printk(KERN_ERR "capi: can't alloc capiminor\n"); |
223 | return NULL; | 223 | return NULL; |
@@ -358,7 +358,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) | |||
358 | { | 358 | { |
359 | struct capincci *np, **pp; | 359 | struct capincci *np, **pp; |
360 | 360 | ||
361 | np = kzalloc(sizeof(*np), GFP_ATOMIC); | 361 | np = kzalloc(sizeof(*np), GFP_KERNEL); |
362 | if (!np) | 362 | if (!np) |
363 | return NULL; | 363 | return NULL; |
364 | np->ncci = ncci; | 364 | np->ncci = ncci; |