You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/macintosh/adbhid.c
This commit is contained in:
@@ -856,7 +856,7 @@ static int usbtouch_probe(struct usb_interface *intf,
|
||||
le16_to_cpu(udev->descriptor.idProduct));
|
||||
|
||||
usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));
|
||||
strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
|
||||
strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
|
||||
|
||||
input_dev->name = usbtouch->name;
|
||||
input_dev->phys = usbtouch->phys;
|
||||
|
||||
Reference in New Issue
Block a user