aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/usbtouchscreen.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2007-10-12 21:27:47 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2007-10-12 21:27:47 -0400
commitb981d8b3f5e008ff10d993be633ad00564fc22cd (patch)
treee292dc07b22308912cf6a58354a608b9e5e8e1fd /drivers/input/touchscreen/usbtouchscreen.c
parentb11d2127c4893a7315d1e16273bc8560049fa3ca (diff)
parent2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/macintosh/adbhid.c
Diffstat (limited to 'drivers/input/touchscreen/usbtouchscreen.c')
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 9b3a26cd1a8d..9fb3d5c30999 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -856,7 +856,7 @@ static int usbtouch_probe(struct usb_interface *intf,
856 le16_to_cpu(udev->descriptor.idProduct)); 856 le16_to_cpu(udev->descriptor.idProduct));
857 857
858 usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys)); 858 usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));
859 strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys)); 859 strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
860 860
861 input_dev->name = usbtouch->name; 861 input_dev->name = usbtouch->name;
862 input_dev->phys = usbtouch->phys; 862 input_dev->phys = usbtouch->phys;