From: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Cc: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/easycap/easycap_ioctl.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c
index 304376f..a5c6d8e 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/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;
}
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
