svn commit: r218607 - stable/7/sys/dev/sound/pci

[Marius Strobl]

Author: marius
Date: Sat Feb 12 13:41:02 2011
New Revision: 218607
URL: http://svn.freebsd.org/changeset/base/218607

Log:
  MFC: r218478
  
  Correct signedness and off-by-one issues in parameters used for DMA tag
  creation.
  
  PR:		154259
  Submitted by:	Vladislav Movchan (partially)

Modified:
  stable/7/sys/dev/sound/pci/emu10k1.c
  stable/7/sys/dev/sound/pci/emu10kx.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/sound/pci/emu10k1.c
==============================================================================
--- stable/7/sys/dev/sound/pci/emu10k1.c	Sat Feb 12 13:41:00 2011	(r218606)
+++ stable/7/sys/dev/sound/pci/emu10k1.c	Sat Feb 12 13:41:02 2011	(r218607)
@@ -2012,7 +2012,7 @@ emu_pci_attach(device_t dev)
 
 	if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2,
 		/*boundary*/0,
-		/*lowaddr*/1 << 31, /* can only access 0-2gb */
+		/*lowaddr*/(1U << 31) - 1, /* can only access 0-2gb */
 		/*highaddr*/BUS_SPACE_MAXADDR,
 		/*filter*/NULL, /*filterarg*/NULL,
 		/*maxsize*/sc->bufsz, /*nsegments*/1, /*maxsegz*/0x3ffff,

Modified: stable/7/sys/dev/sound/pci/emu10kx.c
==============================================================================
--- stable/7/sys/dev/sound/pci/emu10kx.c	Sat Feb 12 13:41:00 2011	(r218606)
+++ stable/7/sys/dev/sound/pci/emu10kx.c	Sat Feb 12 13:41:02 2011	(r218607)
@@ -2696,7 +2696,7 @@ emu_init(struct emu_sc_info *sc)
 
 	if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(sc->dev),
 	     /* alignment */ 2, /* boundary */ 0,
-	     /* lowaddr */ 1 << 31,	/* can only access 0-2gb */
+	     /* lowaddr */ (1U << 31) - 1,	/* can only access 0-2gb */
 	     /* highaddr */ BUS_SPACE_MAXADDR,
 	     /* filter */ NULL, /* filterarg */ NULL,
 	     /* maxsize */ EMU_MAX_BUFSZ, /* nsegments */ 1, /* maxsegz */ 0x3ffff,