diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /sound/oss/ad1848.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
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) | |||
| 280 | while (timeout > 0 && (ad_read(devc, 11) & 0x20)) | 280 | while (timeout > 0 && (ad_read(devc, 11) & 0x20)) |
| 281 | timeout--; | 281 | timeout--; |
| 282 | if (ad_read(devc, 11) & 0x20) | 282 | if (ad_read(devc, 11) & 0x20) |
| 283 | if ( (devc->model != MD_1845) || (devc->model != MD_1845_SSCAPE)) | 283 | if ((devc->model != MD_1845) && (devc->model != MD_1845_SSCAPE)) |
| 284 | printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n"); | 284 | printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n"); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| @@ -2107,7 +2107,7 @@ int ad1848_control(int cmd, int arg) | |||
| 2107 | switch (cmd) | 2107 | switch (cmd) |
| 2108 | { | 2108 | { |
| 2109 | case AD1848_SET_XTAL: /* Change clock frequency of AD1845 (only ) */ | 2109 | case AD1848_SET_XTAL: /* Change clock frequency of AD1845 (only ) */ |
| 2110 | if (devc->model != MD_1845 || devc->model != MD_1845_SSCAPE) | 2110 | if (devc->model != MD_1845 && devc->model != MD_1845_SSCAPE) |
| 2111 | return -EINVAL; | 2111 | return -EINVAL; |
| 2112 | spin_lock_irqsave(&devc->lock,flags); | 2112 | spin_lock_irqsave(&devc->lock,flags); |
| 2113 | ad_enter_MCE(devc); | 2113 | ad_enter_MCE(devc); |