Commit f7d79385 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB: hook up the other (non-HID) input devices to the input system properly.

parent 609088f5
...@@ -318,6 +318,7 @@ aiptek_probe(struct usb_interface *intf, ...@@ -318,6 +318,7 @@ aiptek_probe(struct usb_interface *intf,
aiptek->dev.id.vendor = dev->descriptor.idVendor; aiptek->dev.id.vendor = dev->descriptor.idVendor;
aiptek->dev.id.product = dev->descriptor.idProduct; aiptek->dev.id.product = dev->descriptor.idProduct;
aiptek->dev.id.version = dev->descriptor.bcdDevice; aiptek->dev.id.version = dev->descriptor.bcdDevice;
aiptek->dev.dev = &intf->dev;
aiptek->usbdev = dev; aiptek->usbdev = dev;
endpoint = &intf->altsetting[0].endpoint[0].desc; endpoint = &intf->altsetting[0].endpoint[0].desc;
......
...@@ -172,6 +172,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -172,6 +172,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
kbtab->dev.id.vendor = dev->descriptor.idVendor; kbtab->dev.id.vendor = dev->descriptor.idVendor;
kbtab->dev.id.product = dev->descriptor.idProduct; kbtab->dev.id.product = dev->descriptor.idProduct;
kbtab->dev.id.version = dev->descriptor.bcdDevice; kbtab->dev.id.version = dev->descriptor.bcdDevice;
kbtab->dev.dev = &intf->dev;
kbtab->usbdev = dev; kbtab->usbdev = dev;
endpoint = &intf->altsetting[0].endpoint[0].desc; endpoint = &intf->altsetting[0].endpoint[0].desc;
......
...@@ -388,6 +388,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i ...@@ -388,6 +388,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
pm->input.id.product = udev->descriptor.idProduct; pm->input.id.product = udev->descriptor.idProduct;
pm->input.id.version = udev->descriptor.bcdDevice; pm->input.id.version = udev->descriptor.bcdDevice;
pm->input.event = powermate_input_event; pm->input.event = powermate_input_event;
pm->input.dev = &intf->dev;
input_register_device(&pm->input); input_register_device(&pm->input);
......
...@@ -299,6 +299,7 @@ static int usb_kbd_probe(struct usb_interface *iface, ...@@ -299,6 +299,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
kbd->dev.id.vendor = dev->descriptor.idVendor; kbd->dev.id.vendor = dev->descriptor.idVendor;
kbd->dev.id.product = dev->descriptor.idProduct; kbd->dev.id.product = dev->descriptor.idProduct;
kbd->dev.id.version = dev->descriptor.bcdDevice; kbd->dev.id.version = dev->descriptor.bcdDevice;
kbd->dev.dev = &iface->dev;
if (!(buf = kmalloc(63, GFP_KERNEL))) { if (!(buf = kmalloc(63, GFP_KERNEL))) {
usb_free_urb(kbd->irq); usb_free_urb(kbd->irq);
......
...@@ -183,6 +183,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_ ...@@ -183,6 +183,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_
mouse->dev.id.vendor = dev->descriptor.idVendor; mouse->dev.id.vendor = dev->descriptor.idVendor;
mouse->dev.id.product = dev->descriptor.idProduct; mouse->dev.id.product = dev->descriptor.idProduct;
mouse->dev.id.version = dev->descriptor.bcdDevice; mouse->dev.id.version = dev->descriptor.bcdDevice;
mouse->dev.dev = &intf->dev;
if (!(buf = kmalloc(63, GFP_KERNEL))) { if (!(buf = kmalloc(63, GFP_KERNEL))) {
usb_buffer_free(dev, 8, mouse->data, mouse->data_dma); usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
......
...@@ -578,6 +578,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -578,6 +578,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
wacom->dev.id.vendor = dev->descriptor.idVendor; wacom->dev.id.vendor = dev->descriptor.idVendor;
wacom->dev.id.product = dev->descriptor.idProduct; wacom->dev.id.product = dev->descriptor.idProduct;
wacom->dev.id.version = dev->descriptor.bcdDevice; wacom->dev.id.version = dev->descriptor.bcdDevice;
wacom->dev.dev = &intf->dev;
wacom->usbdev = dev; wacom->usbdev = dev;
endpoint = &intf->altsetting[0].endpoint[0].desc; endpoint = &intf->altsetting[0].endpoint[0].desc;
......
...@@ -267,6 +267,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -267,6 +267,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
xpad->dev.id.vendor = udev->descriptor.idVendor; xpad->dev.id.vendor = udev->descriptor.idVendor;
xpad->dev.id.product = udev->descriptor.idProduct; xpad->dev.id.product = udev->descriptor.idProduct;
xpad->dev.id.version = udev->descriptor.bcdDevice; xpad->dev.id.version = udev->descriptor.bcdDevice;
xpad->dev.dev = &intf->dev;
xpad->dev.private = xpad; xpad->dev.private = xpad;
xpad->dev.name = xpad_device[i].name; xpad->dev.name = xpad_device[i].name;
xpad->dev.phys = xpad->phys; xpad->dev.phys = xpad->phys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment