From 609088f5240490631e36a45f2b98b3dd431150b2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Jan 2004 23:29:14 -0800 Subject: [PATCH] USB: hook up the HID device's struct device to the input system properly. --- drivers/usb/input/hid-core.c | 1 + drivers/usb/input/hid-input.c | 1 + drivers/usb/input/hid.h | 1 + 3 files changed, 3 insertions(+) diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index bde3364f41fb4..d35807538e82b 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c @@ -1546,6 +1546,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) hid->version = le16_to_cpu(hdesc->bcdHID); hid->country = hdesc->bCountryCode; hid->dev = dev; + hid->intf = intf; hid->ifnum = interface->desc.bInterfaceNumber; hid->name[0] = 0; diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c index d02886d8275ed..f078f8e6fefde 100644 --- a/drivers/usb/input/hid-input.c +++ b/drivers/usb/input/hid-input.c @@ -592,6 +592,7 @@ int hidinput_connect(struct hid_device *hid) hidinput->input.id.vendor = dev->descriptor.idVendor; hidinput->input.id.product = dev->descriptor.idProduct; hidinput->input.id.version = dev->descriptor.bcdDevice; + hidinput->input.dev = &hid->intf->dev; } for (i = 0; i < report->maxfield; i++) diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h index cc13afe00fac2..535ce3b3e5b45 100644 --- a/drivers/usb/input/hid.h +++ b/drivers/usb/input/hid.h @@ -342,6 +342,7 @@ struct hid_device { /* device report descriptor */ struct hid_report_enum report_enum[HID_REPORT_TYPES]; struct usb_device *dev; /* USB device */ + struct usb_interface *intf; /* USB interface */ int ifnum; /* USB interface number */ unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */ -- 2.53.0