 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_url.c,v 1.70 2019/08/23 04:32:57 mrg Exp $	*/
+/*	$NetBSD: if_url.c,v 1.71 2019/08/30 05:59:17 mrg Exp $	*/
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -34,27 +34,27 @@
  * The RTL8150L(Realtek USB to fast ethernet controller) spec can be found at
  *   ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/8150v14.pdf
  *   ftp://152.104.125.40/lancard/data_sheet/8150/8150v14.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.70 2019/08/23 04:32:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.71 2019/08/30 05:59:17 mrg Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
 @@ -180,75 +180,75 @@ url_attach(device_t parent, device_t sel
 	un->un_ops = &url_ops;
 	un->un_rx_xfer_flags = USBD_SHORT_XFER_OK;
 	un->un_tx_xfer_flags = USBD_FORCE_SHORT_XFER;
 	un->un_rx_list_cnt = URL_RX_LIST_CNT;
 	un->un_tx_list_cnt = URL_TX_LIST_CNT;
 	un->un_rx_bufsz = URL_BUFSZ;
 	un->un_tx_bufsz = URL_BUFSZ;
 	/* Move the device into the configured state. */
 	err = usbd_set_config_no(dev, URL_CONFIG_NO, 1);
 	if (err) {
 		aprint_error_dev(self, "failed to set configuration"
 		    ", err=%s\n", usbd_errstr(err));
-		goto bad;
+		return;
+	}
 	/* get control interface */
 	err = usbd_device2interface_handle(dev, URL_IFACE_INDEX, &iface);
 	if (err) {
 		aprint_error_dev(self, "failed to get interface, err=%s\n",
 		       usbd_errstr(err));
-		goto bad;
+		return;
+	}
 	un->un_iface = iface;
 	un->un_flags = url_lookup(uaa->uaa_vendor, uaa->uaa_product)->url_flags;
 #if 0
 	if (un->un_flags & URL_EXT_PHY) {
 		un->un_read_reg_cb = url_ext_mii_read_reg;
 		un->un_write_reg_cb = url_ext_mii_write_reg;
+	}
 #endif
 	/* get interface descriptor */
 	id = usbd_get_interface_descriptor(un->un_iface);
 	/* find endpoints */
 	un->un_ed[USBNET_ENDPT_RX] = un->un_ed[USBNET_ENDPT_TX] =
 	    un->un_ed[USBNET_ENDPT_INTR] = 0;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(un->un_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "couldn't get endpoint %d\n", i);
-			goto bad;
+			return;
+		}
 		if ((ed->bmAttributes & UE_XFERTYPE) == UE_BULK &&
 		    UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN)
 			un->un_ed[USBNET_ENDPT_RX] = ed->bEndpointAddress;
 		else if ((ed->bmAttributes & UE_XFERTYPE) == UE_BULK &&
 			 UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT)
 			un->un_ed[USBNET_ENDPT_TX] = ed->bEndpointAddress;
 		else if ((ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT &&
 			 UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN)
 			un->un_ed[USBNET_ENDPT_INTR] = ed->bEndpointAddress;
+	}
 	if (un->un_ed[USBNET_ENDPT_RX] == 0 ||
 	    un->un_ed[USBNET_ENDPT_TX] == 0 ||
 	    un->un_ed[USBNET_ENDPT_INTR] == 0) {
 		aprint_error_dev(self, "missing endpoint\n");
-		goto bad;
+		return;
+	}
 	/* Set these up now for url_mem().  */
 	usbnet_attach(un, "urldet");
 	/* reset the adapter */
 	usbnet_lock(un);
 	url_reset(un);
 	usbnet_unlock(un);
 	/* Get Ethernet Address */
 	usbnet_lock_mii(un);
 	err = url_mem(un, URL_CMD_READMEM, URL_IDR0, (void *)un->un_eaddr,