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/pas2_card.c | |
| parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
| parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
| download | linux-rt-9fb5430c3d6e96a74fd4406dbe7608f36abb9987.tar.gz | |
Merge branch 'topic/oss-fix' into for-linus
Diffstat (limited to 'sound/oss/pas2_card.c')
| -rw-r--r-- | sound/oss/pas2_card.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 25f3a22c52ee..7f377ec3486d 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c @@ -156,9 +156,7 @@ static int __init config_pas_hw(struct address_info *hw_config) * 0x80 */ , 0xB88); - pas_write(0x80 - | joystick?0x40:0 - ,0xF388); + pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388); if (pas_irq < 0 || pas_irq > 15) { |