From f7d793856098ce7889c0b22f27bce0d4d182cae7 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <greg@kroah.com>
Date: Mon, 19 Jan 2004 23:37:47 -0800
Subject: [PATCH] [PATCH] USB: hook up the other (non-HID) input devices to the
 input system properly.

---
 drivers/usb/input/aiptek.c    | 1 +
 drivers/usb/input/kbtab.c     | 1 +
 drivers/usb/input/powermate.c | 1 +
 drivers/usb/input/usbkbd.c    | 1 +
 drivers/usb/input/usbmouse.c  | 1 +
 drivers/usb/input/wacom.c     | 1 +
 drivers/usb/input/xpad.c      | 1 +
 7 files changed, 7 insertions(+)

diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index ccfa5a79c1c6a..c0c9080bb714e 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -318,6 +318,7 @@ aiptek_probe(struct usb_interface *intf,
 	aiptek->dev.id.vendor = dev->descriptor.idVendor;
 	aiptek->dev.id.product = dev->descriptor.idProduct;
 	aiptek->dev.id.version = dev->descriptor.bcdDevice;
+	aiptek->dev.dev = &intf->dev;
 	aiptek->usbdev = dev;
 
 	endpoint = &intf->altsetting[0].endpoint[0].desc;
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index 84ca1106ade7d..c37912ab547ff 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -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.product = dev->descriptor.idProduct;
 	kbtab->dev.id.version = dev->descriptor.bcdDevice;
+	kbtab->dev.dev = &intf->dev;
 	kbtab->usbdev = dev;
 
 	endpoint = &intf->altsetting[0].endpoint[0].desc;
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index da692d746bf50..9b567663b2c5a 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -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.version = udev->descriptor.bcdDevice;
 	pm->input.event = powermate_input_event;
+	pm->input.dev = &intf->dev;
 
 	input_register_device(&pm->input);
 
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
index 57659fdae0de4..0910320e2aefe 100644
--- a/drivers/usb/input/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
@@ -299,6 +299,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
 	kbd->dev.id.vendor = dev->descriptor.idVendor;
 	kbd->dev.id.product = dev->descriptor.idProduct;
 	kbd->dev.id.version = dev->descriptor.bcdDevice;
+	kbd->dev.dev = &iface->dev;
 
 	if (!(buf = kmalloc(63, GFP_KERNEL))) {
 		usb_free_urb(kbd->irq);
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
index eabe1a343fdd1..e293da9399bab 100644
--- a/drivers/usb/input/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
@@ -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.product = dev->descriptor.idProduct;
 	mouse->dev.id.version = dev->descriptor.bcdDevice;
+	mouse->dev.dev = &intf->dev;
 
 	if (!(buf = kmalloc(63, GFP_KERNEL))) {
 		usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index 6cd182956c898..752fa119995c4 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -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.product = dev->descriptor.idProduct;
 	wacom->dev.id.version = dev->descriptor.bcdDevice;
+	wacom->dev.dev = &intf->dev;
 	wacom->usbdev = dev;
 
 	endpoint = &intf->altsetting[0].endpoint[0].desc;
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index c1e1724c6f61d..cf75afeea5587 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -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.product = udev->descriptor.idProduct;
 	xpad->dev.id.version = udev->descriptor.bcdDevice;
+	xpad->dev.dev = &intf->dev;
 	xpad->dev.private = xpad;
 	xpad->dev.name = xpad_device[i].name;
 	xpad->dev.phys = xpad->phys;
-- 
2.53.0