diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 15:55:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 15:55:49 -0800 |
| commit | d7906de1d774ca70d696d3047223bb3e5e759d92 (patch) | |
| tree | 6065caea25668f9fd33c23a24047cecb2c5b5cd7 /drivers/pcmcia/pxa2xx_mainstone.c | |
| parent | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (diff) | |
| parent | 725a6abfe37025975c125ace1c7da35f27ce5384 (diff) | |
| download | op-kernel-dev-d7906de1d774ca70d696d3047223bb3e5e759d92.zip op-kernel-dev-d7906de1d774ca70d696d3047223bb3e5e759d92.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Diffstat (limited to 'drivers/pcmcia/pxa2xx_mainstone.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_mainstone.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index 5209d8c..5d957df 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c @@ -171,10 +171,9 @@ static int __init mst_pcmcia_init(void) { int ret; - mst_pcmcia_device = kmalloc(sizeof(*mst_pcmcia_device), GFP_KERNEL); + mst_pcmcia_device = kzalloc(sizeof(*mst_pcmcia_device), GFP_KERNEL); if (!mst_pcmcia_device) return -ENOMEM; - memset(mst_pcmcia_device, 0, sizeof(*mst_pcmcia_device)); mst_pcmcia_device->name = "pxa2xx-pcmcia"; mst_pcmcia_device->dev.platform_data = &mst_pcmcia_ops; |
