diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2011-02-08 18:12:43 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-09 14:59:05 -0500 |
commit | 5dd00908be5220477993002896a8c382fa67681a (patch) | |
tree | c602c56a2f3966d362e7f67e3953cf95624ddf18 /drivers/staging/easycap | |
parent | 8d6139547ca349f9acea6536dd6b7f6140d3507f (diff) |
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 304376f08f5..a5c6d8ef4f0 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/easycap/easycap_ioctl.c | |||
@@ -2389,12 +2389,13 @@ case VIDIOC_STREAMOFF: { | |||
2389 | /*---------------------------------------------------------------------------*/ | 2389 | /*---------------------------------------------------------------------------*/ |
2390 | JOM(8, "calling wake_up on wq_video and wq_audio\n"); | 2390 | JOM(8, "calling wake_up on wq_video and wq_audio\n"); |
2391 | wake_up_interruptible(&(peasycap->wq_video)); | 2391 | wake_up_interruptible(&(peasycap->wq_video)); |
2392 | #ifdef EASYCAP_NEEDS_ALSA | 2392 | #ifdef CONFIG_EASYCAP_OSS |
2393 | wake_up_interruptible(&(peasycap->wq_audio)); | ||
2394 | |||
2395 | #else | ||
2393 | if (NULL != peasycap->psubstream) | 2396 | if (NULL != peasycap->psubstream) |
2394 | snd_pcm_period_elapsed(peasycap->psubstream); | 2397 | snd_pcm_period_elapsed(peasycap->psubstream); |
2395 | #else | 2398 | #endif /* CONFIG_EASYCAP_OSS */ |
2396 | wake_up_interruptible(&(peasycap->wq_audio)); | ||
2397 | #endif /*EASYCAP_NEEDS_ALSA*/ | ||
2398 | /*---------------------------------------------------------------------------*/ | 2399 | /*---------------------------------------------------------------------------*/ |
2399 | break; | 2400 | break; |
2400 | } | 2401 | } |