diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/fc4/soc.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| download | linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/fc4/soc.c')
| -rw-r--r-- | drivers/fc4/soc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c index 247b46302777..ec1f94738c59 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; |