From 9b0fc66c83c724701dddbd8f8bf4f847d368b793 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 17 Feb 2009 08:02:16 +0100 Subject: [PATCH] --- yaml --- r: 133167 b: refs/heads/master c: b22f5d94c432e97df8d85151fcf3da16cee75f04 h: refs/heads/master i: 133165: 51ac6b3c20b9d186273aba35c1953d1895637066 133163: df0f8b0187e893c0399d5849034829bff1a6ab7e 133159: 65d7b117bbec3d79b9525e2ead0ee77e60ea9911 133151: 7560ceca78c8547a3b69ea2360ff49e785141847 v: v3 --- [refs] | 2 +- trunk/sound/oss/ad1848.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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"); }