Input: do not overwrite the first part of phys string
authorMárton Németh <nm127@freemail.hu>
Mon, 23 Nov 2009 16:26:38 +0000 (08:26 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Nov 2009 16:50:52 +0000 (08:50 -0800)
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>
drivers/hid/usbhid/usbkbd.c
drivers/input/misc/ati_remote.c
drivers/input/misc/powermate.c

index b342926..f843443 100644 (file)
@@ -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;
index e290fde..614b65d 100644 (file)
@@ -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));
index a53c488..668913d 100644 (file)
@@ -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);