From 776a91e4f26d27adeeecb150ef7a63c6c6b11b66 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Thu, 25 Oct 2012 02:11:51 -0400 Subject: [PATCH] --- yaml --- r: 337337 b: refs/heads/master c: 34ec83f4c1dc0d6bf4b056f89841706907a06255 h: refs/heads/master i: 337335: b834b7d0460de77b1cd3df397a5a6b11fb67528a v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a7ba128c9c0..a1ba120f7882 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db9d1f6dd2601aee860304ffc1023a7d5709f314 +refs/heads/master: 34ec83f4c1dc0d6bf4b056f89841706907a06255 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index f08f4593b186..ee0f0e4e41ad 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -3657,8 +3657,11 @@ static u32 slic_card_locate(struct adapter *adapter) if (!physcard) { /* no structure allocated for this physical card yet */ physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); - if (!physcard) + if (!physcard) { + if (card_hostid == SLIC_HOSTID_DEFAULT) + kfree(card); return -ENOMEM; + } physcard->next = slic_global.phys_card; slic_global.phys_card = physcard;