diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /sound/core/timer.c | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
| download | kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.zip kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.gz kernel_samsung_smdk4412-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 9d8184a..0af337e 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -146,7 +146,7 @@ static struct snd_timer *snd_timer_find(struct snd_timer_id *tid) return NULL; } -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES static void snd_timer_request(struct snd_timer_id *tid) { @@ -259,8 +259,8 @@ int snd_timer_open(struct snd_timer_instance **ti, /* open a master instance */ mutex_lock(®ister_mutex); timer = snd_timer_find(tid); -#ifdef CONFIG_KMOD - if (timer == NULL) { +#ifdef CONFIG_MODULES + if (!timer) { mutex_unlock(®ister_mutex); snd_timer_request(tid); mutex_lock(®ister_mutex); |