commit b22f5d94c432e97df8d85151fcf3da16cee75f04
author Takashi Iwai <tiwai@suse.de> Tue Feb 17 08:02:16 2009 +0100
committer Takashi Iwai <tiwai@suse.de> Tue Feb 17 08:02:16 2009 +0100
tree 1e67ebb07fc003f79ce53a8d1bc01df39d0adb1d
parent a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d

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

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 @@
 	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");
 }