From owner-svn-src-stable@FreeBSD.ORG Mon Jun 4 07:08:58 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD51E106564A; Mon, 4 Jun 2012 07:08:58 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97EC68FC14; Mon, 4 Jun 2012 07:08:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5478w73011522; Mon, 4 Jun 2012 07:08:58 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5478wal011520; Mon, 4 Jun 2012 07:08:58 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201206040708.q5478wal011520@svn.freebsd.org> From: Alexander Motin Date: Mon, 4 Jun 2012 07:08:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236544 - stable/8/sys/dev/ata X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2012 07:08:58 -0000 Author: mav Date: Mon Jun 4 07:08:58 2012 New Revision: 236544 URL: http://svn.freebsd.org/changeset/base/236544 Log: MFC r236184: Make legacy ATA to not call device_add_child() with unit number but without driver name. Modified: stable/8/sys/dev/ata/ata-all.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/dev/ata/ata-all.c ============================================================================== --- stable/8/sys/dev/ata/ata-all.c Mon Jun 4 07:07:46 2012 (r236543) +++ stable/8/sys/dev/ata/ata-all.c Mon Jun 4 07:08:58 2012 (r236544) @@ -886,7 +886,7 @@ ata_add_child(device_t parent, struct at { device_t child; - if ((child = device_add_child(parent, NULL, unit))) { + if ((child = device_add_child(parent, (unit < 0) ? NULL : "ad", unit))) { device_set_softc(child, atadev); device_quiet(child); atadev->dev = child;