svn commit: r236543 - stable/9/sys/dev/ata

Alexander Motin mav at FreeBSD.org
Mon Jun 4 07:07:47 UTC 2012


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;


More information about the svn-src-stable-9 mailing list