From ad7c2f392967317df552c38130abb799ec192efc Mon Sep 17 00:00:00 2001
From: maya <maya@NetBSD.org>
Date: Tue, 10 Oct 2017 11:43:26 +0000
Subject: [PATCH] Reorder to test for null before null deref in debug code

---
 sys/dev/usb/usbdi_util.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 8aba378ae466..55e0ecf25de9 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.67 2017/10/10 11:40:54 maya Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.68 2017/10/10 11:43:26 maya Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.67 2017/10/10 11:40:54 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.68 2017/10/10 11:43:26 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -314,9 +314,10 @@ usbd_get_protocol(struct usbd_interface *iface, uint8_t *report)
 
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 
-	DPRINTFN(4, "iface=%p, endpt=%d", iface, id->bInterfaceNumber, 0, 0);
 	if (id == NULL)
 		return USBD_IOERROR;
+	DPRINTFN(4, "iface=%p, endpt=%d", iface, id->bInterfaceNumber, 0, 0);
+
 	usbd_interface2device_handle(iface, &dev);
 	req.bmRequestType = UT_READ_CLASS_INTERFACE;
 	req.bRequest = UR_GET_PROTOCOL;