Commit 8f6f7260 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] VIA audio fixes

From: Alan Cox <alan@redhat.com>

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.
parent d2613306
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#define VIA_VERSION "1.9.1-ac3-2.5" #define VIA_VERSION "1.9.1-ac4-2.5"
#include <linux/config.h> #include <linux/config.h>
...@@ -1237,7 +1237,6 @@ static int via_chan_set_stereo (struct via_info *card, ...@@ -1237,7 +1237,6 @@ static int via_chan_set_stereo (struct via_info *card,
} }
/* unknown */ /* unknown */
default: default:
printk (KERN_WARNING PFX "unknown number of channels\n");
val = -EINVAL; val = -EINVAL;
break; break;
} }
...@@ -3368,7 +3367,7 @@ static int via_dsp_release(struct inode *inode, struct file *file) ...@@ -3368,7 +3367,7 @@ static int via_dsp_release(struct inode *inode, struct file *file)
if (file->f_mode & FMODE_WRITE) { if (file->f_mode & FMODE_WRITE) {
rc = via_dsp_drain_playback (card, &card->ch_out, nonblock); 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); printk (KERN_DEBUG "via_audio: ignoring drain playback error %d\n", rc);
via_chan_free (card, &card->ch_out); via_chan_free (card, &card->ch_out);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment