diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-14 12:20:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-14 12:20:37 -0400 |
commit | fa286188ce0fce994c3fc2bddcafeb948834591f (patch) | |
tree | 72abc08a625c4341fc6606fdd547ed320b81fc66 /drivers/usb/host | |
parent | e44694e858ed000ef11ee37861c7f7c86d8ddbda (diff) |
Revert "usb: move struct usb_device->children to struct usb_hub_port->child"
This reverts commit bebc56d58dc780539777d2b1ca80df5566e2ad87.
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>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/r8a66597-hcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 4c82fdf5494f..c868be65e763 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -2040,8 +2040,7 @@ static void collect_usb_address_map(struct usb_device *udev, unsigned long *map) | |||
2040 | map[udev->devnum/32] |= (1 << (udev->devnum % 32)); | 2040 | map[udev->devnum/32] |= (1 << (udev->devnum % 32)); |
2041 | 2041 | ||
2042 | for (chix = 0; chix < udev->maxchild; chix++) { | 2042 | for (chix = 0; chix < udev->maxchild; chix++) { |
2043 | struct usb_device *childdev = | 2043 | struct usb_device *childdev = udev->children[chix]; |
2044 | usb_get_hub_child_device(udev, chix + 1); | ||
2045 | 2044 | ||
2046 | if (childdev) | 2045 | if (childdev) |
2047 | collect_usb_address_map(childdev, map); | 2046 | collect_usb_address_map(childdev, map); |