Skip to content

Commit

Permalink
Input: gscps2 - convert to use kzalloc
Browse files Browse the repository at this point in the history
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Mariusz Kozlowski authored and Dmitry Torokhov committed Aug 30, 2007
1 parent d9f0383 commit 7460caf
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/input/serio/gscps2.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,17 +340,15 @@ static int __init gscps2_probe(struct parisc_device *dev)
if (dev->id.sversion == 0x96)
hpa += GSC_DINO_OFFSET;

ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
if (!ps2port || !serio) {
ret = -ENOMEM;
goto fail_nomem;
}

dev_set_drvdata(&dev->dev, ps2port);

memset(ps2port, 0, sizeof(struct gscps2port));
memset(serio, 0, sizeof(struct serio));
ps2port->port = serio;
ps2port->padev = dev;
ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);
Expand Down

0 comments on commit 7460caf

Please sign in to comment.