From 84b48f0c92f4e5ab78039ea29196b710b28375cf Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Fri, 2 Sep 2011 11:05:45 -0700 Subject: [PATCH] --- yaml --- r: 264927 b: refs/heads/master c: 66381755442189bbeb15f1a51b1e0059327d84ed h: refs/heads/master i: 264925: c873845ef6fc8b69ae2e56f22721655c19fa4b26 264923: f1e6f77945fef5985ad2a21dd66eb3469d4bbfd5 264919: 493670fac29616c438bbbd463b48e169039509fd 264911: a9e073cc02e3a517efc52318384d1fe08c27a5b7 264895: 76898ac5f6a30fa3e7fa4ddea5cb8b31be2b1c03 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-mem.c | 1 + trunk/drivers/usb/host/xhci.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 58fc06073c27..77333e3afbd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 750645f8a6543ff4deb4d98a0052000a31fdd43f +refs/heads/master: 66381755442189bbeb15f1a51b1e0059327d84ed diff --git a/trunk/drivers/usb/host/xhci-mem.c b/trunk/drivers/usb/host/xhci-mem.c index 9afce47e69df..1755c668ac05 100644 --- a/trunk/drivers/usb/host/xhci-mem.c +++ b/trunk/drivers/usb/host/xhci-mem.c @@ -922,6 +922,7 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud top_dev = top_dev->parent) /* Found device below root hub */; dev->fake_port = top_dev->portnum; + dev->real_port = port_num; xhci_dbg(xhci, "Set root hub portnum to %d\n", port_num); xhci_dbg(xhci, "Set fake root hub portnum to %d\n", dev->fake_port); diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h index bfb3fab20795..ec4817003a56 100644 --- a/trunk/drivers/usb/host/xhci.h +++ b/trunk/drivers/usb/host/xhci.h @@ -799,6 +799,7 @@ struct xhci_virt_device { u32 cmd_status; struct list_head cmd_list; u8 fake_port; + u8 real_port; };