summaryrefslogtreecommitdiff
path: root/drivers/fc4/soc.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-09 01:20:26 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-09 01:20:26 -0500
commitc7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch)
tree1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /drivers/fc4/soc.c
parent8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff)
parent8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff)
Merge branch 'upstream'
Diffstat (limited to 'drivers/fc4/soc.c')
-rw-r--r--drivers/fc4/soc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 247b4630277..ec1f94738c5 100644
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -556,10 +556,9 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
int size, i;
int irq;
- s = kmalloc (sizeof (struct soc), GFP_KERNEL);
+ s = kzalloc (sizeof (struct soc), GFP_KERNEL);
if (s == NULL)
return;
- memset (s, 0, sizeof(struct soc));
spin_lock_init(&s->lock);
s->soc_no = no;