summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-17 08:02:16 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-17 08:02:16 +0100
commitb22f5d94c432e97df8d85151fcf3da16cee75f04 (patch)
tree1e67ebb07fc003f79ce53a8d1bc01df39d0adb1d /sound/oss
parenta259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d (diff)
downloadlinux-b22f5d94c432e97df8d85151fcf3da16cee75f04.tar.gz
linux-b22f5d94c432e97df8d85151fcf3da16cee75f04.tar.bz2
linux-b22f5d94c432e97df8d85151fcf3da16cee75f04.zip
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>
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 a5b83568bdc8..d12bd98a37ba 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");
}