Merge nommu tree

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

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index a2dfe0b0f1ec53d24a78e6c141b813772589f8db..5e830f444c6c6b9d8148b7cd34a505f30bdbf294 100644 (file)
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -132,12 +132,10 @@ int __init scoop_probe(struct platform_device *pdev)
        if (!mem)
                return -EINVAL;
 
-       devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL);
-
+       devptr = kzalloc(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;