diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
| commit | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (patch) | |
| tree | 1c990d9f2f91f6daabbf2de957bea744dd2bcb71 /sound/oss/ad1848.c | |
| parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
| parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
Merge branch 'topic/oss-fix' into for-linus
Diffstat (limited to 'sound/oss/ad1848.c')
| -rw-r--r-- | sound/oss/ad1848.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 7cf9913a47b2..d12bd98a37ba 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"); } @@ -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); |