From 5dd00908be5220477993002896a8c382fa67681a Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 9 Feb 2011 01:12:43 +0200 Subject: [PATCH] staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSS Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/easycap/easycap_ioctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c index 304376f08f5c..a5c6d8ef4f07 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; } -- 2.20.1