From owner-svn-src-stable@freebsd.org  Mon Jun  8 09:25:41 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F2063288D9;
 Mon,  8 Jun 2020 09:25:41 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49gSXj10G3z41d7;
 Mon,  8 Jun 2020 09:25:41 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D72C21CFF;
 Mon,  8 Jun 2020 09:25:41 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0589PeZI029733;
 Mon, 8 Jun 2020 09:25:40 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0589PeF2029732;
 Mon, 8 Jun 2020 09:25:40 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <202006080925.0589PeF2029732@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 8 Jun 2020 09:25:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r361909 - stable/9/sys/dev/usb
X-SVN-Group: stable-9
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/9/sys/dev/usb
X-SVN-Commit-Revision: 361909
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2020 09:25:41 -0000

Author: hselasky
Date: Mon Jun  8 09:25:40 2020
New Revision: 361909
URL: https://svnweb.freebsd.org/changeset/base/361909

Log:
  MFC r361577:
  Don't allow USB device drivers to parent own interface.
  It will prevent proper USB device detach.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/9/sys/dev/usb/usb_device.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/usb/usb_device.c
==============================================================================
--- stable/9/sys/dev/usb/usb_device.c	Mon Jun  8 09:25:01 2020	(r361908)
+++ stable/9/sys/dev/usb/usb_device.c	Mon Jun  8 09:25:40 2020	(r361909)
@@ -1241,7 +1241,7 @@ usbd_set_parent_iface(struct usb_device *udev, uint8_t
 {
 	struct usb_interface *iface;
 
-	if (udev == NULL) {
+	if (udev == NULL || iface_index == parent_index) {
 		/* nothing to do */
 		return;
 	}