leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "usb: move struct usb_device->children to struct usb_hub_port->child"

Browse Source 
This reverts commit bebc56d58d.

The call here is fragile and not well thought out, so revert it, it's
not fully baked yet and I don't want this to go into 3.5.

Cc: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-05-14 09:20:37 -07:00
parent e44694e858
commit fa286188ce
5 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/usb.h
View File

@@ -424,6 +424,7 @@ enum usb_device_removable {
* access from userspace
* @usbfs_dentry: usbfs dentry entry for the device
* @maxchild: number of ports if hub
* @children: child devices - USB devices that are attached to this hub
* @quirks: quirks of the whole device
* @urbnum: number of URBs submitted for the whole device
* @active_duration: total time device is not suspended
@@ -490,6 +491,7 @@ struct usb_device {
struct list_head filelist;
int maxchild;
struct usb_device **children;
u32 quirks;
atomic_t urbnum;
@@ -515,8 +517,6 @@ static inline struct usb_device *interface_to_usbdev(struct usb_interface *intf)
extern struct usb_device *usb_get_dev(struct usb_device *dev);
extern void usb_put_dev(struct usb_device *dev);
extern struct usb_device *usb_get_hub_child_device(struct usb_device *hdev,
int port1);
/* USB device locking */
#define usb_lock_device(udev) device_lock(&(udev)->dev)