From owner-svn-src-stable-12@freebsd.org  Thu Dec 17 12:58:06 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@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 11E354B6AFB;
 Thu, 17 Dec 2020 12:58:06 +0000 (UTC)
 (envelope-from mmel@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 4CxX9974HKz3Nls;
 Thu, 17 Dec 2020 12:58:05 +0000 (UTC)
 (envelope-from mmel@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 E13F019058;
 Thu, 17 Dec 2020 12:58:05 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BHCw5uH015038;
 Thu, 17 Dec 2020 12:58:05 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BHCw5WZ015037;
 Thu, 17 Dec 2020 12:58:05 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <202012171258.0BHCw5WZ015037@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Thu, 17 Dec 2020 12:58:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r368715 - stable/12/sys/dev/pci
X-SVN-Group: stable-12
X-SVN-Commit-Author: mmel
X-SVN-Commit-Paths: stable/12/sys/dev/pci
X-SVN-Commit-Revision: 368715
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-12@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2020 12:58:06 -0000

Author: mmel
Date: Thu Dec 17 12:58:05 2020
New Revision: 368715
URL: https://svnweb.freebsd.org/changeset/base/368715

Log:
  MFC r368364:
  
    DesignWare PCIe driver: Don't call bus_generic_attach() twice.
    bus_generic_attach() should be called from the attach function of the real
    implementation, not from the common init function.

Modified:
  stable/12/sys/dev/pci/pci_dw.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/pci/pci_dw.c
==============================================================================
--- stable/12/sys/dev/pci/pci_dw.c	Thu Dec 17 12:41:47 2020	(r368714)
+++ stable/12/sys/dev/pci/pci_dw.c	Thu Dec 17 12:58:05 2020	(r368715)
@@ -651,7 +651,7 @@ pci_dw_init(device_t dev)
 
 	device_add_child(dev, "pci", -1);
 
-	return (bus_generic_attach(dev));
+	return (0);
 out:
 	/* XXX Cleanup */
 	return (rv);