Merge git://git.infradead.org/iommu-2.6

[safe/jmp/linux-2.6] / drivers / pcmcia / sa1111_generic.c

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index deb5036..de6bc33 100644 (file)
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -127,10 +127,6 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
        ops->socket_state = sa1111_pcmcia_socket_state;
        ops->socket_suspend = sa1111_pcmcia_socket_suspend;
 
-       s = kzalloc(sizeof(*s) * ops->nr, GFP_KERNEL);
-       if (!s)
-               return -ENODEV;
-
        for (i = 0; i < ops->nr; i++) {
                s = kzalloc(sizeof(*s), GFP_KERNEL);
                if (!s)