===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mixerctl/mixerctl.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/mixerctl/mixerctl.c	2007/11/26 13:36:34	1.26
--- src/usr.bin/mixerctl/mixerctl.c	2008/01/13 21:26:01	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: mixerctl.c,v 1.26 2007/11/26 13:36:34 deraadt Exp $	*/
  /*	$NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: mixerctl.c,v 1.27 2008/01/13 21:26:01 ratchov Exp $	*/
  /*	$NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $	*/
  
  /*
***************
*** 341,354 ****
  
  	for (j = i = 0; i < ndev; i++) {
  		if (infos[i].type != AUDIO_MIXER_CLASS &&
! 		    infos[i].type != -1) {
  			fields[j++] = rfields[i];
  			for (pos = infos[i].next; pos != AUDIO_MIXER_LAST;
  			    pos = infos[pos].next) {
  				fields[j] = rfields[pos];
  				catstr(rfields[i].name, infos[pos].label.name,
  				    fields[j].name);
- 				infos[pos].type = -1;
  				j++;
  			}
  		}
--- 341,353 ----
  
  	for (j = i = 0; i < ndev; i++) {
  		if (infos[i].type != AUDIO_MIXER_CLASS &&
! 		    infos[i].prev == AUDIO_MIXER_LAST) {
  			fields[j++] = rfields[i];
  			for (pos = infos[i].next; pos != AUDIO_MIXER_LAST;
  			    pos = infos[pos].next) {
  				fields[j] = rfields[pos];
  				catstr(rfields[i].name, infos[pos].label.name,
  				    fields[j].name);
  				j++;
  			}
  		}