redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage

Browse source 
The commit 4916b3a57f introduced a
hid regression between 2.6.19 and 2.6.20-rc1. The device put in
input_dev->cdev is now of type usb_device instead of usb_interface.

Before:
> # readlink -f /sys/class/input/input6/event4/device
> /sys/devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.1
After:
> # readlink -f /sys/class/input/input3/event3/device
> /sys/devices/pci0000:00/0000:00:10.0/usb1/1-1

This causes breakage:
> # udevinfo -q all -n /dev/input/event3
> P: /class/input/input3/event3
> N: input/event3
> S: input/by-path/pci-1-1--event-
> E: ID_SERIAL=noserial
> E: ID_PATH=pci-1-1-

No ID_MODEL, ID_VENDOR, ID_REVISION, ID_TYPE etc etc.

Fix this by assigning the intf->dev into hid->dev, and fixing
all the users.

Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Anssi Hannula 2007-01-19 19:28:17 +02:00 committed by Jiri Kosina
parent f7ebf99eb4
commit be8209753b
4 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/usb/input/hid-core.c
View file

@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work)
if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) { if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) {
dev_dbg(&usbhid->intf->dev, "clear halt\n"); dev_dbg(&usbhid->intf->dev, "clear halt\n");
rc = usb_clear_halt(to_usb_device(hid->dev), usbhid->urbin->pipe); rc = usb_clear_halt(hid_to_usb_dev(hid), usbhid->urbin->pipe);
clear_bit(HID_CLEAR_HALT, &usbhid->iofl); clear_bit(HID_CLEAR_HALT, &usbhid->iofl);
hid_start_in(hid); hid_start_in(hid);
} }
else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) { else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) {
dev_dbg(&usbhid->intf->dev, "resetting device\n"); dev_dbg(&usbhid->intf->dev, "resetting device\n");
rc = rc_lock = usb_lock_device_for_reset(to_usb_device(hid->dev), usbhid->intf); rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);
if (rc_lock >= 0) { if (rc_lock >= 0) {
rc = usb_reset_composite_device(to_usb_device(hid->dev), usbhid->intf); rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf);
if (rc_lock) if (rc_lock)
usb_unlock_device(to_usb_device(hid->dev)); usb_unlock_device(hid_to_usb_dev(hid));
} }
clear_bit(HID_RESET_PENDING, &usbhid->iofl); clear_bit(HID_RESET_PENDING, &usbhid->iofl);
} }
@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work)
break; break;
default: default:
err("can't reset device, %s-%s/input%d, status %d", err("can't reset device, %s-%s/input%d, status %d",
to_usb_device(hid->dev)->bus->bus_name, hid_to_usb_dev(hid)->bus->bus_name,
to_usb_device(hid->dev)->devpath, hid_to_usb_dev(hid)->devpath,
usbhid->ifnum, rc); usbhid->ifnum, rc);
/* FALLTHROUGH */ /* FALLTHROUGH */
case -EHOSTUNREACH: case -EHOSTUNREACH:
@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb)
clear_bit(HID_IN_RUNNING, &usbhid->iofl); clear_bit(HID_IN_RUNNING, &usbhid->iofl);
if (status != -EPERM) { if (status != -EPERM) {
err("can't resubmit intr, %s-%s/input%d, status %d", err("can't resubmit intr, %s-%s/input%d, status %d",
to_usb_device(hid->dev)->bus->bus_name, hid_to_usb_dev(hid)->bus->bus_name,
to_usb_device(hid->dev)->devpath, hid_to_usb_dev(hid)->devpath,
usbhid->ifnum, status); usbhid->ifnum, status);
hid_io_error(hid); hid_io_error(hid);
} }
@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid)
hid_output_report(report, usbhid->outbuf); hid_output_report(report, usbhid->outbuf);
usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0); usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0);
usbhid->urbout->dev = to_usb_device(hid->dev); usbhid->urbout->dev = hid_to_usb_dev(hid);
dbg("submitting out urb"); dbg("submitting out urb");
@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid)
len = ((report->size - 1) >> 3) + 1 + (report->id > 0); len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
if (dir == USB_DIR_OUT) { if (dir == USB_DIR_OUT) {
hid_output_report(report, usbhid->ctrlbuf); hid_output_report(report, usbhid->ctrlbuf);
usbhid->urbctrl->pipe = usb_sndctrlpipe(to_usb_device(hid->dev), 0); usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);
usbhid->urbctrl->transfer_buffer_length = len; usbhid->urbctrl->transfer_buffer_length = len;
} else { } else {
int maxpacket, padlen; int maxpacket, padlen;
usbhid->urbctrl->pipe = usb_rcvctrlpipe(to_usb_device(hid->dev), 0); usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);
maxpacket = usb_maxpacket(to_usb_device(hid->dev), usbhid->urbctrl->pipe, 0); maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);
if (maxpacket > 0) { if (maxpacket > 0) {
padlen = (len + maxpacket - 1) / maxpacket; padlen = (len + maxpacket - 1) / maxpacket;
padlen *= maxpacket; padlen *= maxpacket;
@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
padlen = 0; padlen = 0;
usbhid->urbctrl->transfer_buffer_length = padlen; usbhid->urbctrl->transfer_buffer_length = padlen;
} }
usbhid->urbctrl->dev = to_usb_device(hid->dev); usbhid->urbctrl->dev = hid_to_usb_dev(hid);
usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir; usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;
usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT; usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT;
@ -1187,7 +1187,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
hid->version = le16_to_cpu(hdesc->bcdHID); hid->version = le16_to_cpu(hdesc->bcdHID);
hid->country = hdesc->bCountryCode; hid->country = hdesc->bCountryCode;
hid->dev = &dev->dev; hid->dev = &intf->dev;
usbhid->intf = intf; usbhid->intf = intf;
usbhid->ifnum = interface->desc.bInterfaceNumber; usbhid->ifnum = interface->desc.bInterfaceNumber;
@ -1282,7 +1282,7 @@ static void hid_disconnect(struct usb_interface *intf)
usb_free_urb(usbhid->urbctrl); usb_free_urb(usbhid->urbctrl);
usb_free_urb(usbhid->urbout); usb_free_urb(usbhid->urbout);
hid_free_buffers(to_usb_device(hid->dev), hid); hid_free_buffers(hid_to_usb_dev(hid), hid);
hid_free_device(hid); hid_free_device(hid);
} }

5
drivers/usb/input/hid-ff.c
View file

@ -33,6 +33,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/hid.h> #include <linux/hid.h>
#include "usbhid.h"
/* /*
* This table contains pointers to initializers. To add support for new * This table contains pointers to initializers. To add support for new
@ -70,8 +71,8 @@ static struct hid_ff_initializer inits[] = {
int hid_ff_init(struct hid_device* hid) int hid_ff_init(struct hid_device* hid)
{ {
struct hid_ff_initializer *init; struct hid_ff_initializer *init;
int vendor = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idVendor); int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);
int product = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idProduct); int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);
for (init = inits; init->idVendor; init++) for (init = inits; init->idVendor; init++)
if (init->idVendor == vendor && init->idProduct == product) if (init->idVendor == vendor && init->idProduct == product)

2
drivers/usb/input/hiddev.c
View file

@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
struct hiddev_list *list = file->private_data; struct hiddev_list *list = file->private_data;
struct hiddev *hiddev = list->hiddev; struct hiddev *hiddev = list->hiddev;
struct hid_device *hid = hiddev->hid; struct hid_device *hid = hiddev->hid;
struct usb_device *dev = to_usb_device(hid->dev); struct usb_device *dev = hid_to_usb_dev(hid);
struct hiddev_collection_info cinfo; struct hiddev_collection_info cinfo;
struct hiddev_report_info rinfo; struct hiddev_report_info rinfo;
struct hiddev_field_info finfo; struct hiddev_field_info finfo;

3
drivers/usb/input/usbhid.h
View file

@ -80,5 +80,8 @@ struct usbhid_device {
}; };
#define hid_to_usb_dev(hid_dev) \
container_of(hid_dev->dev->parent, struct usb_device, dev)
#endif #endif