diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/pcmcia/pxa2xx_sharpsl.c | |
| parent | e7c3aad53dba54d375b632f2a21b680546828dec (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 56c58831e80..b5fdeec20b1 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; |