From 4cb954aaca068c4577d8895817f01f84545dc9fd Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 28 Feb 2008 12:02:22 +0100 Subject: [PATCH] --- yaml --- r: 92085 b: refs/heads/master c: d967a02712f09265b3c357f35f125715f5dffd2f h: refs/heads/master i: 92083: e76a0bed8cfd49d651df6aedcdec3f7042084dda v: v3 --- [refs] | 2 +- trunk/sound/pci/ca0106/ca0106_main.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2b91c2a5e662..7ec893d4eded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c74056d437401dc7d43970cd845c34a7e28723c0 +refs/heads/master: d967a02712f09265b3c357f35f125715f5dffd2f diff --git a/trunk/sound/pci/ca0106/ca0106_main.c b/trunk/sound/pci/ca0106/ca0106_main.c index 176e0f0e8058..3818249fcc81 100644 --- a/trunk/sound/pci/ca0106/ca0106_main.c +++ b/trunk/sound/pci/ca0106/ca0106_main.c @@ -435,22 +435,22 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb) { unsigned long flags; - unsigned int enable; - + unsigned int intr_enable; + spin_lock_irqsave(&emu->emu_lock, flags); - enable = inl(emu->port + INTE) | intrenb; - outl(enable, emu->port + INTE); + intr_enable = inl(emu->port + INTE) | intrenb; + outl(intr_enable, emu->port + INTE); spin_unlock_irqrestore(&emu->emu_lock, flags); } static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb) { unsigned long flags; - unsigned int enable; - + unsigned int intr_enable; + spin_lock_irqsave(&emu->emu_lock, flags); - enable = inl(emu->port + INTE) & ~intrenb; - outl(enable, emu->port + INTE); + intr_enable = inl(emu->port + INTE) & ~intrenb; + outl(intr_enable, emu->port + INTE); spin_unlock_irqrestore(&emu->emu_lock, flags); }