From 83103176aa42565c2662d7dc3d89e10211874dcd Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 9 Feb 2011 01:12:43 +0200 Subject: [PATCH] --- yaml --- r: 235876 b: refs/heads/master c: 5dd00908be5220477993002896a8c382fa67681a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/easycap_ioctl.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3d6644fd14ad..47c5db24efcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d6139547ca349f9acea6536dd6b7f6140d3507f +refs/heads/master: 5dd00908be5220477993002896a8c382fa67681a diff --git a/trunk/drivers/staging/easycap/easycap_ioctl.c b/trunk/drivers/staging/easycap/easycap_ioctl.c index 304376f08f5c..a5c6d8ef4f07 100644 --- a/trunk/drivers/staging/easycap/easycap_ioctl.c +++ b/trunk/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; }