Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7460caf3 authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by Dmitry Torokhov
Browse files

Input: gscps2 - convert to use kzalloc 



Signed-off-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent d9f03831

drivers/input/serio/gscps2.c

+2 −4
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ 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;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev) 


	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);