From owner-svn-src-stable-8@FreeBSD.ORG  Fri Jun 18 04:45:07 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21170106564A;
	Fri, 18 Jun 2010 04:45:07 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 103198FC0A;
	Fri, 18 Jun 2010 04:45:07 +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 o5I4j6fo051897;
	Fri, 18 Jun 2010 04:45:06 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5I4j6QD051886;
	Fri, 18 Jun 2010 04:45:06 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201006180445.o5I4j6QD051886@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 18 Jun 2010 04:45:06 +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: r209281 - stable/8/sys/cam/scsi
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2010 04:45:07 -0000

Author: mjacob
Date: Fri Jun 18 04:45:06 2010
New Revision: 209281
URL: http://svn.freebsd.org/changeset/base/209281

Log:
  This is an MFC of 207938
  
  Pick up the right change, not it's close cousin. The one
  previously submitted was wrong.

Modified:
  stable/8/sys/cam/scsi/scsi_sg.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/geom/sched/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_sg.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_sg.c	Fri Jun 18 04:43:22 2010	(r209280)
+++ stable/8/sys/cam/scsi/scsi_sg.c	Fri Jun 18 04:45:06 2010	(r209281)
@@ -304,10 +304,12 @@ sgregister(struct cam_periph *periph, vo
 			      UID_ROOT, GID_OPERATOR, 0600, "%s%d",
 			      periph->periph_name, periph->unit_number);
 	if (periph->unit_number < 26) {
-		(void)make_dev_alias(softc->dev, "sg%c", periph->unit_number + 'a');
+		(void)make_dev_alias(softc->dev, "sg%c",
+		    periph->unit_number + 'a');
 	} else {
 		(void)make_dev_alias(softc->dev, "sg%c%c",
-		    ((periph->unit_number / 26) - 1) + 'a', periph->unit_number + 'a');
+		    ((periph->unit_number / 26) - 1) + 'a',
+		    (periph->unit_number % 26) + 'a');
 	}
 	cam_periph_lock(periph);
 	softc->dev->si_drv1 = periph;