Gitweb: http://git.kernel.org/linus/b22f5d94c432e97df8d85151fcf3da16cee75f04
Commit: b22f5d94c432e97df8d85151fcf3da16cee75f04
Parent: a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d
Author: Takashi Iwai <tiwai@suse.de>
AuthorDate: Tue Feb 17 08:02:16 2009 +0100
Committer: Takashi Iwai <tiwai@suse.de>
CommitDate: Tue Feb 17 08:02:16 2009 +0100
sound: OSS: ad1848 - Fix another typo
Fix another typo of || and &&.
Reported-by: Jörg-Volker Peetz <jvpeetz@web.de>
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 a5b8356..d12bd98 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -280,7 +280,7 @@ static void wait_for_calibration(ad1848_info * devc)
while (timeout > 0 && (ad_read(devc, 11) & 0x20))
timeout--;
if (ad_read(devc, 11) & 0x20)
- if ( (devc->model != MD_1845) || (devc->model != MD_1845_SSCAPE))
+ if ((devc->model != MD_1845) && (devc->model != MD_1845_SSCAPE))
printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n");
}
--
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
