usb 2-1: new low speed USB device using uhci_hcd and address 7usb 2-1: New USB device found, idVendor=0079, idProduct=0006usb 2-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0usb 2-1: Product: Generic USB Joystick usb 2-1: Manufacturer: DragonRise Inc. usb 2-1: configuration #1 chosen from 1 choice
--- joydev-2.6.28.10.c 2009-05-03 00:54:43.000000000 +0600+++ joydev-2.6.30.1.c 2009-07-03 05:52:38.000000000 +0600@@ -159,12 +159,9 @@ static int joydev_fasync(int fd, struct file *file, int on) {- int retval; struct joydev_client *client = file->private_data; - retval = fasync_helper(fd, file, on, &client->fasync);-- return retval < 0 ? retval : 0;+ return fasync_helper(fd, file, on, &client->fasync); } static void joydev_free(struct device *dev)@@ -800,7 +797,7 @@ } } - strlcpy(joydev->dev.bus_id, joydev->name, sizeof(joydev->dev.bus_id));+ dev_set_name(&joydev->dev, joydev->name); joydev->dev.devt = MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor); joydev->dev.class = &input_class; joydev->dev.parent = &dev->dev;@@ -846,7 +843,13 @@ INPUT_DEVICE_ID_MATCH_KEYBIT, .evbit = { BIT_MASK(EV_KEY) }, .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },- }, /* Avoid itouchpads, touchscreens and tablets */+ }, /* Avoid itouchpads and touchscreens */+ {+ .flags = INPUT_DEVICE_ID_MATCH_EVBIT |+ INPUT_DEVICE_ID_MATCH_KEYBIT,+ .evbit = { BIT_MASK(EV_KEY) },+ .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) },+ }, /* Avoid tablets, digitisers and similar devices */ { } /* Terminating entry */ };
- strlcpy(joydev->dev.bus_id, joydev->name, sizeof(joydev->dev.bus_id));+ dev_set_name(&joydev->dev, joydev->name);