Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54f0fad3 authored by Jan Kiszka's avatar Jan Kiszka Committed by David S. Miller
Browse files

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: default avatarJan Kiszka <jan.kiszka@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05b41494

drivers/isdn/capi/capi.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci) 
	unsigned int minor = 0;

	unsigned long flags;



	mp = kzalloc(sizeof(*mp), GFP_ATOMIC);

	mp = kzalloc(sizeof(*mp), GFP_KERNEL);

  	if (!mp) {

  		printk(KERN_ERR "capi: can't alloc capiminor\n");

		return NULL;
@@ -358,7 +358,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) 
{

	struct capincci *np, **pp;



	np = kzalloc(sizeof(*np), GFP_ATOMIC);

	np = kzalloc(sizeof(*np), GFP_KERNEL);

	if (!np)

		return NULL;

	np->ncci = ncci;