]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSS
authorTomas Winkler <tomas.winkler@intel.com>
Tue, 8 Feb 2011 23:12:43 +0000 (01:12 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Feb 2011 19:59:05 +0000 (11:59 -0800)
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/easycap/easycap_ioctl.c

index 304376f08f5cde88f11588b126a524642975b549..a5c6d8ef4f079c742389cd0a76eb13c54efe3e61 100644 (file)
@@ -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;
 }