Merge branch 'upstream'

[linux-2.6] / drivers / fc4 / soc.c

diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 247b4630277748acd536e142270cf3b5f4214002..ec1f94738c59712d47091ff38a8a8cc8ac66f2ea 100644 (file)
--- 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;