1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index f46ee1fefe02..000ab7225717 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -508,6 +508,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 case USB_PORT_FEAT_U1_TIMEOUT:
                         usbip_dbg_vhci_rh(
                                 " SetPortFeature: USB_PORT_FEAT_U1_TIMEOUT\n");
+                        /* Fall through */
                 case USB_PORT_FEAT_U2_TIMEOUT:
                         usbip_dbg_vhci_rh(
                                 " SetPortFeature: USB_PORT_FEAT_U2_TIMEOUT\n");
@@ -654,15 +655,9 @@ error:
 static void vhci_tx_urb(struct urb *urb, struct vhci_device *vdev)
 {
         struct vhci_priv *priv;
-        struct vhci_hcd *vhci_hcd;
+        struct vhci_hcd *vhci_hcd = vdev_to_vhci_hcd(vdev);
         unsigned long flags;
 
-        if (!vdev) {
-                pr_err("could not get virtual device");
-                return;
-        }
-        vhci_hcd = vdev_to_vhci_hcd(vdev);
-
         priv = kzalloc(sizeof(struct vhci_priv), GFP_ATOMIC);
         if (!priv) {
                 usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_MALLOC);