From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 8 Feb 2011 23:12:43 +0000 (+0200)
Subject: staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSS
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~632
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5dd00908be5220477993002896a8c382fa67681a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSS

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

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;
 }