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

Commit 8ff22ea7 authored by Jeff Garzik's avatar Jeff Garzik Committed by Dmitry Torokhov
Browse files

Input: trackpoint - handle sysfs errors 



Also use kzalloc instead of kcalloc since we are allocating single object.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 8dd51650

drivers/input/mouse/trackpoint.c

+10 −2
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) 
	struct ps2dev *ps2dev = &psmouse->ps2dev;

	unsigned char firmware_id;

	unsigned char button_info;

	int error;



	if (trackpoint_start_protocol(psmouse, &firmware_id))

		return -1;
@@ -305,7 +306,7 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) 
		button_info = 0;

	}



	psmouse->private = priv = kcalloc(1, sizeof(struct trackpoint_data), GFP_KERNEL);

	psmouse->private = priv = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);

	if (!priv)

		return -1;
@@ -318,7 +319,14 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) 
	trackpoint_defaults(priv);

	trackpoint_sync(psmouse);



	sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);

	error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group);

	if (error) {

		printk(KERN_ERR

			"trackpoint.c: failed to create sysfs attributes, error: %d\n",

			error);

		kfree(priv);

		return -1;

	}



	printk(KERN_INFO "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n",

		firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f);