From 77f004626b191be75644220b1d70616156d208f0 Mon Sep 17 00:00:00 2001 From: "sifram.rajas@gmail.com" Date: Fri, 2 Sep 2011 11:06:00 -0700 Subject: [PATCH] --- yaml --- r: 264935 b: refs/heads/master c: 73ddc2474bcc5234fa0a4e406e015ed16d16b6c8 h: refs/heads/master i: 264933: 7db7bca9281be37d1fc205bdc3786d24c4cf5902 264931: 6761a53dc29ebbc7cef648974d27a6a9fd46db93 264927: 84b48f0c92f4e5ab78039ea29196b710b28375cf v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae5163a6d3cc..f5b8df40792f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ffdea25f054439c31c24b248faa647685280571 +refs/heads/master: 73ddc2474bcc5234fa0a4e406e015ed16d16b6c8 diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c index 6440bd210c48..dd0dc15680b6 100644 --- a/trunk/drivers/usb/host/xhci.c +++ b/trunk/drivers/usb/host/xhci.c @@ -945,8 +945,7 @@ static int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev, return -ENODEV; if (check_virt_dev) { - if (!udev->slot_id || !xhci->devs - || !xhci->devs[udev->slot_id]) { + if (!udev->slot_id || !xhci->devs[udev->slot_id]) { printk(KERN_DEBUG "xHCI %s called with unaddressed " "device\n", func); return -EINVAL;