linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / common / scoop.c

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 314ebd3..a2dfe0b 100644 (file)
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -18,18 +18,6 @@
 #include <asm/io.h>
 #include <asm/hardware/scoop.h>
 
-/* PCMCIA to Scoop linkage
-
-   There is no easy way to link multiple scoop devices into one
-   single entity for the pxa2xx_pcmcia device so this structure
-   is used which is setup by the platform code.
-
-   This file is never modular so this symbol is always
-   accessile to the board support files.
-*/
-struct scoop_pcmcia_config *platform_scoop_config;
-EXPORT_SYMBOL(platform_scoop_config);
-
 #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))
 
 struct  scoop_dev {
@@ -144,10 +132,12 @@ int __init scoop_probe(struct platform_device *pdev)
        if (!mem)
                return -EINVAL;
 
-       devptr = kzalloc(sizeof(struct scoop_dev), GFP_KERNEL);
+       devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL);
+
        if (!devptr)
-               return -ENOMEM;
+               return  -ENOMEM;
 
+       memset(devptr, 0, sizeof(struct scoop_dev));
        spin_lock_init(&devptr->scoop_lock);
 
        inf = pdev->dev.platform_data;