diff options
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) | |||
264 | int ret; | 264 | int ret; |
265 | 265 | ||
266 | sharpsl_pcmcia_ops.nr=platform_scoop_config->num_devs; | 266 | sharpsl_pcmcia_ops.nr=platform_scoop_config->num_devs; |
267 | sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL); | 267 | sharpsl_pcmcia_device = kzalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL); |
268 | if (!sharpsl_pcmcia_device) | 268 | if (!sharpsl_pcmcia_device) |
269 | return -ENOMEM; | 269 | return -ENOMEM; |
270 | 270 | ||
271 | memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device)); | ||
272 | sharpsl_pcmcia_device->name = "pxa2xx-pcmcia"; | 271 | sharpsl_pcmcia_device->name = "pxa2xx-pcmcia"; |
273 | sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops; | 272 | sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops; |
274 | sharpsl_pcmcia_device->dev.parent=platform_scoop_config->devs[0].dev; | 273 | sharpsl_pcmcia_device->dev.parent=platform_scoop_config->devs[0].dev; |