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: Márton Németh <nm127@freemail.hu>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index b342926dd7fcbc91d697e4c058a5c0889a265d4b..f843443ba5c3efc3764876ed7aa5ab6300f2ef68 100644 (file)
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -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;

diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c
index e290fde35e74ff626e8e7cde2af795e7d832bbb1..614b65d78fe9d23e44cdb612877459f16b80148b 100644 (file)
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
@@ -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));

diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index a53c4885fbadc96b3805625af212ed4ada1a64e4..668913d12044c25004d934dbcd3cb3e6a55f1c5f 100644 (file)
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -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);