From 9acd8c69f6dd7fddf80dfbbe2764892c716bfba4 Mon Sep 17 00:00:00 2001 From: Max Vozeler Date: Wed, 12 Jan 2011 15:02:05 +0200 Subject: [PATCH] --- yaml --- r: 232610 b: refs/heads/master c: 01446ef5af4e8802369bf4d257806e24345a9371 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/vhci.h | 3 --- trunk/drivers/staging/usbip/vhci_hcd.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index af3557a3ce48..b8daa6380011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd65f6233f6bc3233e7910752689fe3a45dc2e0c +refs/heads/master: 01446ef5af4e8802369bf4d257806e24345a9371 diff --git a/trunk/drivers/staging/usbip/vhci.h b/trunk/drivers/staging/usbip/vhci.h index 2cfd00ec1164..afc3b1a71881 100644 --- a/trunk/drivers/staging/usbip/vhci.h +++ b/trunk/drivers/staging/usbip/vhci.h @@ -100,9 +100,6 @@ struct vhci_hcd { * But, the index of this array begins from 0. */ struct vhci_device vdev[VHCI_NPORTS]; - - /* vhci_device which has not been assiged its address yet */ - int pending_port; }; diff --git a/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/drivers/staging/usbip/vhci_hcd.c index 22b1ad9ebd56..a35fe61268de 100644 --- a/trunk/drivers/staging/usbip/vhci_hcd.c +++ b/trunk/drivers/staging/usbip/vhci_hcd.c @@ -138,8 +138,6 @@ void rh_port_connect(int rhport, enum usb_device_speed speed) * the_controller->vdev[rhport].ud.status = VDEV_CONNECT; * spin_unlock(&the_controller->vdev[rhport].ud.lock); */ - the_controller->pending_port = rhport; - spin_unlock_irqrestore(&the_controller->lock, flags); usb_hcd_poll_rh_status(vhci_to_hcd(the_controller)); @@ -575,7 +573,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, return urb->status; } - vdev = port_to_vdev(the_controller->pending_port); + vdev = port_to_vdev(urb->dev->portnum-1); /* refuse enqueue for dead connection */ spin_lock(&vdev->ud.lock);