diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-02-09 01:12:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-09 11:59:05 -0800 |
| commit | 5dd00908be5220477993002896a8c382fa67681a (patch) | |
| tree | c602c56a2f3966d362e7f67e3953cf95624ddf18 /drivers/staging/easycap | |
| parent | 8d6139547ca349f9acea6536dd6b7f6140d3507f (diff) | |
| download | kernel_samsung_smdk4412-5dd00908be5220477993002896a8c382fa67681a.zip kernel_samsung_smdk4412-5dd00908be5220477993002896a8c382fa67681a.tar.gz kernel_samsung_smdk4412-5dd00908be5220477993002896a8c382fa67681a.tar.bz2 | |
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>
Diffstat (limited to 'drivers/staging/easycap')
| -rw-r--r-- | 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; } |