---

yaml --- r: 235876 b: refs/heads/master c: 5dd0090 h: refs/heads/master v: v3
git-mirror · Feb 9, 2011 · 8310317 · 8310317
1 parent f0924c6
commit 8310317
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d6139547ca349f9acea6536dd6b7f6140d3507f
+refs/heads/master: 5dd00908be5220477993002896a8c382fa67681a
diff --git a/trunk/drivers/staging/easycap/easycap_ioctl.c b/trunk/drivers/staging/easycap/easycap_ioctl.c
@@ -2389,12 +2389,13 @@ case VIDIOC_STREAMOFF: {
 /*---------------------------------------------------------------------------*/
 	JOM(8, "calling wake_up on wq_video and wq_audio\n");
 	wake_up_interruptible(&(peasycap->wq_video));
-#ifdef EASYCAP_NEEDS_ALSA
+#ifdef CONFIG_EASYCAP_OSS
+	wake_up_interruptible(&(peasycap->wq_audio));
+
+#else
 	if (NULL != peasycap->psubstream)
 		snd_pcm_period_elapsed(peasycap->psubstream);
-#else
-	wake_up_interruptible(&(peasycap->wq_audio));
-#endif /*EASYCAP_NEEDS_ALSA*/
+#endif /* CONFIG_EASYCAP_OSS */
 /*---------------------------------------------------------------------------*/
 	break;
 }