From owner-svn-src-stable-9@FreeBSD.ORG  Mon Jun  4 07:07:47 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 38251106566B;
	Mon,  4 Jun 2012 07:07:47 +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 235618FC12;
	Mon,  4 Jun 2012 07:07:47 +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 q5477k4T011422;
	Mon, 4 Jun 2012 07:07:46 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5477k5P011420;
	Mon, 4 Jun 2012 07:07:46 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201206040707.q5477k5P011420@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 4 Jun 2012 07:07:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236543 - stable/9/sys/dev/ata
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 07:07:47 -0000

Author: mav
Date: Mon Jun  4 07:07:46 2012
New Revision: 236543
URL: http://svn.freebsd.org/changeset/base/236543

Log:
  MFC r236184:
  Make legacy ATA to not call device_add_child() with unit number but
  without driver name.

Modified:
  stable/9/sys/dev/ata/ata-all.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ata/ata-all.c
==============================================================================
--- stable/9/sys/dev/ata/ata-all.c	Mon Jun  4 07:05:13 2012	(r236542)
+++ stable/9/sys/dev/ata/ata-all.c	Mon Jun  4 07:07:46 2012	(r236543)
@@ -887,7 +887,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;