From 8f6f7260a6f31e68159de1d966b17778538151b8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Dec 2003 05:55:09 -0800 Subject: [PATCH] [PATCH] VIA audio fixes From: Alan Cox VIA audio had a fix from 2.4 missing so any user could spam the system log. Also include a fix for a bug which is pending 2.4 fixing too and causes a bogus warning to be displayed on close of audio file handle. --- sound/oss/via82cxxx_audio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index d22cc14e7eb95..f4f34c510ec74 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c @@ -15,7 +15,7 @@ */ -#define VIA_VERSION "1.9.1-ac3-2.5" +#define VIA_VERSION "1.9.1-ac4-2.5" #include @@ -1237,7 +1237,6 @@ static int via_chan_set_stereo (struct via_info *card, } /* unknown */ default: - printk (KERN_WARNING PFX "unknown number of channels\n"); val = -EINVAL; break; } @@ -3368,7 +3367,7 @@ static int via_dsp_release(struct inode *inode, struct file *file) if (file->f_mode & FMODE_WRITE) { rc = via_dsp_drain_playback (card, &card->ch_out, nonblock); - if (rc && rc != ERESTARTSYS) /* Nobody needs to know about ^C */ + if (rc && rc != -ERESTARTSYS) /* Nobody needs to know about ^C */ printk (KERN_DEBUG "via_audio: ignoring drain playback error %d\n", rc); via_chan_free (card, &card->ch_out); -- 2.53.0