From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 17 Feb 2009 07:02:16 +0000 (+0100)
Subject: sound: OSS: ad1848 - Fix another typo
X-Git-Tag: v2.6.30-rc1~676^2~6^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b22f5d94c432e97df8d85151fcf3da16cee75f04;p=~emulex%2Finfiniband.git

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>
---

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index a5b83568bdc..d12bd98a37b 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");
 }