From a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 15 Feb 2009 20:51:19 +0100 Subject: sound: OSS: &&/|| typo in ad1848.c &&/|| typo Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai --- sound/oss/ad1848.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/oss') diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 7cf9913a47b2..a5b83568bdc8 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); -- cgit v1.2.1