Date: Wed, 18 Aug 2010 20:23:56 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r211466 - stable/8/sys/dev/sound/pci/hda Message-ID: <201008182023.o7IKNuxn079431@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Wed Aug 18 20:23:55 2010 New Revision: 211466 URL: http://svn.freebsd.org/changeset/base/211466 Log: Merge 210839 from head: Do not free sc if attach failed, as it was allocated by the bus infrastructure, not us. This appears to be a leftover from an older version of the driver. Submitted by: avg Tested by: Anton Shterenlikht <mexas bristol.ac.uk> Modified: stable/8/sys/dev/sound/pci/hda/hdac.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cam/ (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) Modified: stable/8/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- stable/8/sys/dev/sound/pci/hda/hdac.c Wed Aug 18 20:23:47 2010 (r211465) +++ stable/8/sys/dev/sound/pci/hda/hdac.c Wed Aug 18 20:23:55 2010 (r211466) @@ -4304,7 +4304,6 @@ hdac_attach_fail: hdac_dma_free(sc, &sc->corb_dma); hdac_mem_free(sc); snd_mtxfree(sc->lock); - free(sc, M_DEVBUF); return (ENXIO); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008182023.o7IKNuxn079431>