From c28f8ad1220f59f3e9782864758c03b703b59435 Mon Sep 17 00:00:00 2001 From: Lior Dotan Date: Wed, 5 Nov 2008 11:27:17 +0200 Subject: [PATCH] --- yaml --- r: 126654 b: refs/heads/master c: 7c7e18790c8236ec2bb7581f5337ecff7e31916e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 02fddd72badd..4ed8c3ff76b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c80db5c9b6649bc499fc799771b0b3edd2d8a97 +refs/heads/master: 7c7e18790c8236ec2bb7581f5337ecff7e31916e diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 00390362f10f..b8ac872e070c 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -2832,9 +2832,8 @@ static u32 slic_card_locate(struct adapter *adapter) } if (!physcard) { /* no structure allocated for this physical card yet */ - physcard = kmalloc(sizeof(struct physcard *), GFP_ATOMIC); + physcard = kzalloc(sizeof(struct physcard *), GFP_ATOMIC); ASSERT(physcard); - memset(physcard, 0, sizeof(struct physcard *)); DBG_MSG ("\n%s Allocate a PHYSICALcard:\n PHYSICAL_Card[%p]\n\