Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/hdaudio One build break fixed, another appears...



details:   https://anonhg.NetBSD.org/src/rev/1b6d7f0fde6b
branches:  trunk
changeset: 1027733:1b6d7f0fde6b
user:      kre <kre%NetBSD.org@localhost>
date:      Fri Dec 17 17:02:40 2021 +0000

description:
One build break fixed, another appears...

Use the correct pointer, not the one used in the other piece of
code that changed at the same time..

diffstat:

 sys/dev/hdaudio/hdafg.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 10c1c5e746e0 -r 1b6d7f0fde6b sys/dev/hdaudio/hdafg.c
--- a/sys/dev/hdaudio/hdafg.c   Fri Dec 17 15:52:30 2021 +0000
+++ b/sys/dev/hdaudio/hdafg.c   Fri Dec 17 17:02:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.24 2021/12/17 13:36:36 christos Exp $ */
+/* $NetBSD: hdafg.c,v 1.25 2021/12/17 17:02:40 kre Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.24 2021/12/17 13:36:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.25 2021/12/17 17:02:40 kre Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -2888,7 +2888,7 @@
                mx[index].mx_di.un.v.num_channels = 2;  /* XXX */
                mx[index].mx_di.mixer_class = HDAUDIO_MIXER_CLASS_OUTPUTS;
                mx[index].mx_di.un.v.delta = 256 / 
-                   (ctl->ctl_step ? ctl->ctl_step : 1);
+                   (masterctl->ctl_step ? masterctl->ctl_step : 1);
                strcpy(mx[index].mx_di.label.name, AudioNmaster);
                strcpy(mx[index].mx_di.un.v.units.name, AudioNvolume);
                hda_trace(sc, "  adding outputs.%s\n",



Home | Main Index | Thread Index | Old Index