mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-25 16:13:17 +00:00
Code Issues Releases Activity

Fixup relative pointers after channel realloc. It fixes crash on systems

Browse Source 
with several HDA codecs per controller.

While I am there, remove some unneeded dereferences.

Submitted by:	Tor Egge <Tor.Egge@cvsup.no.freebsd.org>
This commit is contained in:
Alexander Motin 2009-03-29 07:10:52 +00:00
parent ff8a07fda2
commit f7cdd867ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=190519
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/sound/pci/hda/hdac.c
View File

@ -83,7 +83,7 @@
#include "mixer_if.h"
#define HDA_DRV_TEST_REV "20090316_0130"
#define HDA_DRV_TEST_REV "20090329_0131"
SND_DECLARE_FILE("$FreeBSD$");
@ -5280,7 +5280,7 @@ hdac_audio_bind_as(struct hdac_devinfo *devinfo)
sizeof(struct hdac_chan) * cnt,
M_HDAC, M_ZERO | M_NOWAIT);
if (sc->chans == NULL) {
device_printf(devinfo->codec->sc->dev,
device_printf(sc->dev,
"Channels memory allocation failed!\n");
return;
}
@ -5290,17 +5290,20 @@ hdac_audio_bind_as(struct hdac_devinfo *devinfo)
M_HDAC, M_ZERO | M_NOWAIT);
if (sc->chans == NULL) {
sc->num_chans = 0;
device_printf(devinfo->codec->sc->dev,
device_printf(sc->dev,
"Channels memory allocation failed!\n");
return;
}
/* Fixup relative pointers after realloc */
for (j = 0; j < sc->num_chans; j++)
sc->chans[j].caps.fmtlist = sc->chans[j].fmtlist;
}
free = sc->num_chans;
sc->num_chans += cnt;
for (j = free; j < free + cnt; j++) {
devinfo->codec->sc->chans[j].devinfo = devinfo;
devinfo->codec->sc->chans[j].as = -1;
sc->chans[j].devinfo = devinfo;
sc->chans[j].as = -1;
}
/* Assign associations in order of their numbers, */
@ -5309,10 +5312,10 @@ hdac_audio_bind_as(struct hdac_devinfo *devinfo)
continue;
as[j].chan = free;
devinfo->codec->sc->chans[free].as = j;
devinfo->codec->sc->chans[free].dir =
sc->chans[free].as = j;
sc->chans[free].dir =
(as[j].dir == HDA_CTL_IN) ? PCMDIR_REC : PCMDIR_PLAY;
hdac_pcmchannel_setup(&devinfo->codec->sc->chans[free]);
hdac_pcmchannel_setup(&sc->chans[free]);
free++;
}
}