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

Commit 6236dfaa authored by Márton Németh's avatar Márton Németh Committed by Dmitry Torokhov
Browse files

Input: do not overwrite the first part of phys string 



Use strlcat() to append a string to the previously created first part.

Signed-off-by: default avatarMárton Németh <nm127@freemail.hu>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 52ce4eaa

drivers/hid/usbhid/usbkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int usb_kbd_probe(struct usb_interface *iface, 
			 le16_to_cpu(dev->descriptor.idProduct));



	usb_make_path(dev, kbd->phys, sizeof(kbd->phys));

	strlcpy(kbd->phys, "/input0", sizeof(kbd->phys));

	strlcat(kbd->phys, "/input0", sizeof(kbd->phys));



	input_dev->name = kbd->name;

	input_dev->phys = kbd->phys;

drivers/input/misc/ati_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de 
	ati_remote->interface = interface;



	usb_make_path(udev, ati_remote->phys, sizeof(ati_remote->phys));

	strlcpy(ati_remote->phys, "/input0", sizeof(ati_remote->phys));

	strlcat(ati_remote->phys, "/input0", sizeof(ati_remote->phys));



	if (udev->manufacturer)

		strlcpy(ati_remote->name, udev->manufacturer, sizeof(ati_remote->name));

drivers/input/misc/powermate.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i 
	pm->input = input_dev;



	usb_make_path(udev, pm->phys, sizeof(pm->phys));

	strlcpy(pm->phys, "/input0", sizeof(pm->phys));

	strlcat(pm->phys, "/input0", sizeof(pm->phys));



	spin_lock_init(&pm->lock);