diff --git a/[refs] b/[refs]
index ef34a10c54ed..67299619dd9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1afa6e2e1d26d0b9d96785ee1823bf11c4c5f202
+refs/heads/master: a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d
diff --git a/trunk/sound/oss/ad1848.c b/trunk/sound/oss/ad1848.c
index 7cf9913a47b2..a5b83568bdc8 100644
--- a/trunk/sound/oss/ad1848.c
+++ b/trunk/sound/oss/ad1848.c
@@ -2107,7 +2107,7 @@ int ad1848_control(int cmd, int arg)
 	switch (cmd)
 	{
 		case AD1848_SET_XTAL:	/* Change clock frequency of AD1845 (only ) */
-			if (devc->model != MD_1845 || devc->model != MD_1845_SSCAPE)
+			if (devc->model != MD_1845 && devc->model != MD_1845_SSCAPE)
 				return -EINVAL;
 			spin_lock_irqsave(&devc->lock,flags);
 			ad_enter_MCE(devc);