Gitweb: http://git.kernel.org/linus/a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d
Commit: a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d
Parent: 1afa6e2e1d26d0b9d96785ee1823bf11c4c5f202
Author: Roel Kluin <roel.kluin@gmail.com>
AuthorDate: Sun Feb 15 20:51:19 2009 +0100
Committer: Takashi Iwai <tiwai@suse.de>
CommitDate: Mon Feb 16 10:25:11 2009 +0100
sound: OSS: &&/|| typo in ad1848.c
&&/|| typo
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/oss/ad1848.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 7cf9913..a5b8356 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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
