summaryrefslogtreecommitdiff
path: root/drivers/usb/host/r8a66597-hcd.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-14 20:20:37 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-14 20:20:37 +0400
commitfa286188ce0fce994c3fc2bddcafeb948834591f (patch)
tree72abc08a625c4341fc6606fdd547ed320b81fc66 /drivers/usb/host/r8a66597-hcd.c
parente44694e858ed000ef11ee37861c7f7c86d8ddbda (diff)
downloadlinux-fa286188ce0fce994c3fc2bddcafeb948834591f.tar.xz
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/r8a66597-hcd.c')
-rw-r--r--drivers/usb/host/r8a66597-hcd.c3
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)
map[udev->devnum/32] |= (1 << (udev->devnum % 32));
for (chix = 0; chix < udev->maxchild; chix++) {
- struct usb_device *childdev =
- usb_get_hub_child_device(udev, chix + 1);
+ struct usb_device *childdev = udev->children[chix];
if (childdev)
collect_usb_address_map(childdev, map);