From owner-svn-src-all@FreeBSD.ORG  Sat Jan 10 21:38:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0256D1065677;
	Sat, 10 Jan 2009 21:38:38 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E52EE8FC1B;
	Sat, 10 Jan 2009 21:38:37 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ALcbAa009422;
	Sat, 10 Jan 2009 21:38:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0ALcbRe009421;
	Sat, 10 Jan 2009 21:38:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200901102138.n0ALcbRe009421@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 10 Jan 2009 21:38:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187036 - head/sys/dev/sound/pcm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 21:38:38 -0000

Author: mav
Date: Sat Jan 10 21:38:37 2009
New Revision: 187036
URL: http://svn.freebsd.org/changeset/base/187036

Log:
  OSS tools expect EINVAL for unsupported ioctls, but not ENXIO.

Modified:
  head/sys/dev/sound/pcm/mixer.c

Modified: head/sys/dev/sound/pcm/mixer.c
==============================================================================
--- head/sys/dev/sound/pcm/mixer.c	Sat Jan 10 20:54:47 2009	(r187035)
+++ head/sys/dev/sound/pcm/mixer.c	Sat Jan 10 21:38:37 2009	(r187036)
@@ -1040,7 +1040,7 @@ mixer_ioctl_cmd(struct cdev *i_dev, u_lo
 		case SNDCTL_MIXERINFO:
 			return (mixer_oss_mixerinfo(i_dev, (oss_mixerinfo *)arg));
 		}
-		return (ENXIO);
+		return (EINVAL);
 	}
 
 	m = i_dev->si_drv1;
@@ -1090,7 +1090,6 @@ mixer_ioctl_cmd(struct cdev *i_dev, u_lo
 	ret = 0;
 
 	switch (cmd) {
- 	/** @todo Double check return values, error codes. */
 	case SNDCTL_DSP_GET_RECSRC_NAMES:
 		bcopy((void *)&m->enuminfo, arg, sizeof(oss_mixer_enuminfo));
 		break;
@@ -1104,7 +1103,7 @@ mixer_ioctl_cmd(struct cdev *i_dev, u_lo
 		*arg_i = SOUND_VERSION;
 		break;
 	default:
-		ret = ENXIO;
+		ret = EINVAL;
 		break;
 	}