From owner-svn-src-all@FreeBSD.ORG  Mon May 28 14:33:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EE303106567E;
	Mon, 28 May 2012 14:33:15 +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 D9D1A8FC19;
	Mon, 28 May 2012 14:33:15 +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 q4SEXFeR016599;
	Mon, 28 May 2012 14:33:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4SEXFxN016597;
	Mon, 28 May 2012 14:33:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201205281433.q4SEXFxN016597@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 28 May 2012 14:33:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236184 - head/sys/dev/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2012 14:33:16 -0000

Author: mav
Date: Mon May 28 14:33:15 2012
New Revision: 236184
URL: http://svn.freebsd.org/changeset/base/236184

Log:
  Make legacy ATA to not call device_add_child() with unit number but
  without driver name. This fixed legacy ATA breakage by r235978.
  
  MFC after:	1 week

Modified:
  head/sys/dev/ata/ata-all.c

Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Mon May 28 13:58:08 2012	(r236183)
+++ head/sys/dev/ata/ata-all.c	Mon May 28 14:33:15 2012	(r236184)
@@ -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;