---

yaml --- r: 133167 b: refs/heads/master c: b22f5d9 h: refs/heads/master i: 133165: 51ac6b3 133163: df0f8b0 133159: 65d7b11 133151: 7560cec v: v3
git-mirror · Feb 17, 2009 · 9b0fc66 · 9b0fc66
1 parent 3255b19
commit 9b0fc66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d
+refs/heads/master: b22f5d94c432e97df8d85151fcf3da16cee75f04
diff --git a/trunk/sound/oss/ad1848.c b/trunk/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");
 }