[src/nick-nhusb]: src/sys/dev/usb Fix merge botch

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/650cafb50d5a
branches:  nick-nhusb
changeset: 334475:650cafb50d5a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Apr 10 15:32:26 2016 +0000

description:
Fix merge botch

diffstat:

 sys/dev/usb/xhci.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 96081372d2a7 -r 650cafb50d5a sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Sun Apr 10 10:09:21 2016 +0000
+++ b/sys/dev/usb/xhci.c        Sun Apr 10 15:32:26 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $     */
+/*     $NetBSD: xhci.c,v 1.28.2.56 2016/04/10 15:32:26 skrll Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.56 2016/04/10 15:32:26 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -2316,8 +2316,6 @@
 
        usbd_get_device_strings(dev);
 
-       usbd_get_device_strings(dev);
-
        usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev);
 
        if ((depth == 0) && (port == 0)) {