[PATCH] linux-2.4: br2684: allocation out of atomic context
From: Ralf Baechle <hidden>
Date: 2009-06-29 15:49:21
Also in:
netdev
From: Arne Redlich <redacted> Moved GFP_Kernel allocation out of atomic context Signed-off-by: Arne Redlich <redacted> Signed-off-by: Frank Seidel <redacted> Signed-off-by: Ralf Baechle <redacted> --- net/atm/br2684.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c@@ -509,6 +509,10 @@ Note: we do not have explicit unassign, MOD_DEC_USE_COUNT; return -EFAULT; } + brvcc = kmalloc(sizeof(struct br2684_vcc), GFP_KERNEL); + if (!brvcc) + return -ENOMEM; + memset(brvcc, 0, sizeof(struct br2684_vcc)); write_lock_irq(&devs_lock); brdev = br2684_find_dev(&be.ifspec); if (brdev == NULL) {
@@ -532,11 +536,6 @@ Note: we do not have explicit unassign, err = -EINVAL; goto error; } - brvcc = kmalloc(sizeof(struct br2684_vcc), GFP_KERNEL); - if (!brvcc) { - err = -ENOMEM; - goto error; - } memset(brvcc, 0, sizeof(struct br2684_vcc)); DPRINTK("br2684_regvcc vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc);
@@ -567,6 +566,7 @@ Note: we do not have explicit unassign, return 0; error: write_unlock_irq(&devs_lock); + kfree(brvcc); MOD_DEC_USE_COUNT; return err; }