diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
commit | 52cab57873c25d3c8324ee3e4d463db6e8e73fd7 (patch) | |
tree | 826cb36827afa363944e6478d19512e669446c64 /drivers/pcmcia/pxa2xx_sharpsl.c | |
parent | Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
parent | [NET]: Change 1500 to ETH_DATA_LEN in some files (diff) | |
download | linux-dev-52cab57873c25d3c8324ee3e4d463db6e8e73fd7.tar.xz linux-dev-52cab57873c25d3c8324ee3e4d463db6e8e73fd7.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pcmcia/pxa2xx_sharpsl.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index 56c58831e80e..b5fdeec20b15 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -264,11 +264,10 @@ static int __init sharpsl_pcmcia_init(void) int ret; sharpsl_pcmcia_ops.nr=platform_scoop_config->num_devs; - sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL); + sharpsl_pcmcia_device = kzalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL); if (!sharpsl_pcmcia_device) return -ENOMEM; - memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device)); sharpsl_pcmcia_device->name = "pxa2xx-pcmcia"; sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops; sharpsl_pcmcia_device->dev.parent=platform_scoop_config->devs[0].dev; |