From owner-svn-src-stable@FreeBSD.ORG  Sun Feb 14 19:53:09 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D6011065670;
	Sun, 14 Feb 2010 19:53:09 +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 7C8E08FC22;
	Sun, 14 Feb 2010 19:53:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1EJr96R069034;
	Sun, 14 Feb 2010 19:53:09 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1EJr9pd069032;
	Sun, 14 Feb 2010 19:53:09 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201002141953.o1EJr9pd069032@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 14 Feb 2010 19:53:09 +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: r203895 - 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
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Feb 2010 19:53:09 -0000

Author: mav
Date: Sun Feb 14 19:53:09 2010
New Revision: 203895
URL: http://svn.freebsd.org/changeset/base/203895

Log:
  MFC r203445:
  Report to CAM unit number of underlying ataX bus device, instead of this
  atapicamX. It is more apropriate and useful together with "ata" name.

Modified:
  stable/8/sys/dev/ata/atapi-cam.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/dev/ata/atapi-cam.c
==============================================================================
--- stable/8/sys/dev/ata/atapi-cam.c	Sun Feb 14 19:51:39 2010	(r203894)
+++ stable/8/sys/dev/ata/atapi-cam.c	Sun Feb 14 19:53:09 2010	(r203895)
@@ -201,7 +201,7 @@ atapi_cam_attach(device_t dev)
     scp->parent = device_get_parent(dev);
     scp->ata_ch = device_get_softc(scp->parent);
     TAILQ_INIT(&scp->pending_hcbs);
-    unit = device_get_unit(dev);
+    unit = device_get_unit(device_get_parent(dev));
 
     if ((devq = cam_simq_alloc(16)) == NULL) {
 	error = ENOMEM;