Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / pcmcia / pd6729.c

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index e7a6d9ac5ed8a9feebb8060d7038eba9a617b62b..f2789afb22b2454975fe8bb63d5b7468f146b8f5 100644 (file)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -634,13 +634,11 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
        char configbyte;
        struct pd6729_socket *socket;
 
-       socket = kmalloc(sizeof(struct pd6729_socket) * MAX_SOCKETS,
+       socket = kzalloc(sizeof(struct pd6729_socket) * MAX_SOCKETS,
                         GFP_KERNEL);
        if (!socket)
                return -ENOMEM;
 
-       memset(socket, 0, sizeof(struct pd6729_socket) * MAX_SOCKETS);
-
        if ((ret = pci_enable_device(dev)))
                goto err_out_free_mem;