diff --git a/[refs] b/[refs]
index 67299619dd9c..0e69059d5b0a 100644
--- 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
index a5b83568bdc8..d12bd98a37ba 100644
--- 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");
 }