]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
add alsa patch to review queue
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 18:55:45 +0000 (11:55 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 18:55:45 +0000 (11:55 -0700)
review-2.6.17/alsa-don-t-reject-o_rdwr-at-opening-pcm-oss.patch [new file with mode: 0644]
review-2.6.17/series

diff --git a/review-2.6.17/alsa-don-t-reject-o_rdwr-at-opening-pcm-oss.patch b/review-2.6.17/alsa-don-t-reject-o_rdwr-at-opening-pcm-oss.patch
new file mode 100644 (file)
index 0000000..4a0b64d
--- /dev/null
@@ -0,0 +1,32 @@
+From stable-bounces@linux.kernel.org Fri Aug  4 11:38:11 2006
+Date: Fri, 04 Aug 2006 20:37:33 +0200
+Message-ID: <s5hk65os5xu.wl%tiwai@suse.de>
+From: Takashi Iwai <tiwai@suse.de>
+To: stable@kernel.org
+Subject: ALSA: Don't reject O_RDWR at opening PCM OSS
+
+From: Takashi Iwai <tiwai@suse.de>
+
+[PATCH] ALSA: Don't reject O_RDWR at opening PCM OSS
+
+Accept O_RDWR at opening a PCM OSS device that is read- or write-only,
+just for the compatibility with the behavior of older versions.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/core/oss/pcm_oss.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- linux-2.6.17.7.orig/sound/core/oss/pcm_oss.c
++++ linux-2.6.17.7/sound/core/oss/pcm_oss.c
+@@ -1745,6 +1745,8 @@ static int snd_pcm_oss_open_file(struct 
+       for (idx = 0; idx < 2; idx++) {
+               if (setup[idx].disable)
+                       continue;
++              if (! pcm->streams[idx].substream_count)
++                      continue; /* no matching substream */
+               if (idx == SNDRV_PCM_STREAM_PLAYBACK) {
+                       if (! (f_mode & FMODE_WRITE))
+                               continue;
index 0936fecd350351d43b230aa294add3412a674285..a5c2a8c8822befaf0fd7759e344c5a8935a91991 100644 (file)
@@ -21,3 +21,4 @@ s390-fix-futex_atomic_cmpxchg_inatomic.patch
 tty-serialize-flush_to_ldisc.patch
 add-stable-branch-to-maintainers-file.patch
 have-ext2-reject-file-handles-with-bad-inode-numbers-early.patch
+alsa-don-t-reject-o_rdwr-at-opening-pcm-oss.patch