---

yaml --- r: 26323 b: refs/heads/master c: 5c59e09 h: refs/heads/master i: 26321: a3f2e15 26319: 51c94b5 v: v3
git-mirror · Apr 27, 2006 · 64a7731 · 64a7731
1 parent 307b599
commit 64a7731
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc56eff1279d2f33a6afe74a673360ae1cd0d838
+refs/heads/master: 5c59e09d7e51f5781439aa6f1963076568fd1f4f
diff --git a/trunk/sound/core/oss/pcm_oss.c b/trunk/sound/core/oss/pcm_oss.c
@@ -1242,6 +1242,8 @@ static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int for
 
 	if (format != AFMT_QUERY) {
 		formats = snd_pcm_oss_get_formats(pcm_oss_file);
+		if (formats < 0)
+			return formats;
 		if (!(formats & format))
 			format = AFMT_U8;
 		for (idx = 1; idx >= 0; --idx) {