From 6aa9cac1e1252ca72221fc67f56c4de8d29f9ef7 Mon Sep 17 00:00:00 2001 From: Amit Choudhary Date: Tue, 8 May 2007 00:26:13 -0700 Subject: [PATCH] --- yaml --- r: 54591 b: refs/heads/master c: d9a2f4a4945ebff54c9a011e4dc6e92d899ae26d h: refs/heads/master i: 54589: 9a00cf985b47a8b3e778fe83a37a50ca6e1905e7 54587: c59ef14311112b0563e36b9834a9075af5ec4249 54583: 7492f7bfd5f5061c23688cad724b67810c4938d6 54575: d781d05f360a69321be46ebc9fab9908a9dd5cb7 54559: cc9afafcf33062d2f2347e83c3ff78a9ccd7ee5e 54527: 56391923f1790c18ad9ebefb4ee983eb2806c5e1 v: v3 --- [refs] | 2 +- trunk/drivers/char/synclink.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a481b798f02..6fcc842a2795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd463870dc89cac0f590ea007e3a5210103b1b04 +refs/heads/master: d9a2f4a4945ebff54c9a011e4dc6e92d899ae26d diff --git a/trunk/drivers/char/synclink.c b/trunk/drivers/char/synclink.c index ce4db6f52362..f02a0795983f 100644 --- a/trunk/drivers/char/synclink.c +++ b/trunk/drivers/char/synclink.c @@ -4010,8 +4010,13 @@ static int mgsl_alloc_intermediate_txbuffer_memory(struct mgsl_struct *info) for ( i=0; inum_tx_holding_buffers; ++i) { info->tx_holding_buffers[i].buffer = kmalloc(info->max_frame_size, GFP_KERNEL); - if ( info->tx_holding_buffers[i].buffer == NULL ) + if (info->tx_holding_buffers[i].buffer == NULL) { + for (--i; i >= 0; i--) { + kfree(info->tx_holding_buffers[i].buffer); + info->tx_holding_buffers[i].buffer = NULL; + } return -ENOMEM; + } } return 0;