From 0503cf194ea9d1fdac233b01e8b82fa62a464b9f Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 11 Jan 2007 07:42:14 +0000 Subject: [PATCH] For quite some time running umix would result in 'umix: ioctl request 1079790949 failed: Device not configured' error repeated over and over, making it impossible to use. This patch fixes this. PR: ports/107806 Submitted by: trasz --- audio/umix/files/patch-src::driver_oss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/umix/files/patch-src::driver_oss.c b/audio/umix/files/patch-src::driver_oss.c index 04d24d65360e..c5c8c0231243 100644 --- a/audio/umix/files/patch-src::driver_oss.c +++ b/audio/umix/files/patch-src::driver_oss.c @@ -13,7 +13,7 @@ * oss_open() before initializing. */ int oss_init(void) { -+#ifdef SOUND_MIXER_INFO ++#if 0 /* this is an OSS structure, defined in soundcard.h */ struct mixer_info oss_info; +#endif @@ -24,7 +24,7 @@ mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); -+#ifdef SOUND_MIXER_INFO ++#if 0 /* get the mixer name */ eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); @@ -36,7 +36,7 @@ oss_set_curr_chan(i); oss_update(OSS_UPD_READ); } -+#ifdef SOUND_MIXER_INFO ++#if 0 /* init the modify counter */ eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); mixer_ptr->modifycount = oss_info.modify_counter; @@ -48,7 +48,7 @@ * the device and compares it to the old */ static int oss_check_update(void) { -+#ifdef SOUND_MIXER_INFO ++#if 0 struct mixer_info oss_info; eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info);