aboutsummaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-02-15 20:51:19 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-16 10:25:11 +0100
commita259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d (patch)
tree2b9f86036f4bd395a7d362c3a80847b469a56b1a /sound/oss
parent1afa6e2e1d26d0b9d96785ee1823bf11c4c5f202 (diff)
sound: OSS: &&/|| typo in ad1848.c
&&/|| typo Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/ad1848.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 7cf9913a47b..a5b83568bdc 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -2107,7 +2107,7 @@ int ad1848_control(int cmd, int arg)
switch (cmd)
{
case AD1848_SET_XTAL: /* Change clock frequency of AD1845 (only ) */
- if (devc->model != MD_1845 || devc->model != MD_1845_SSCAPE)
+ if (devc->model != MD_1845 && devc->model != MD_1845_SSCAPE)
return -EINVAL;
spin_lock_irqsave(&devc->lock,flags);
ad_enter_MCE(devc);