diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-03 09:36:50 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-03 09:37:08 +0700 |
| commit | cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932 (patch) | |
| tree | ef9c87ae4e9a14a19e2a0d95f1cb55c9e1e4edb5 /sound | |
| parent | 6c5dadef809982e05b16ba7cf309e7c642a1b56a (diff) | |
| parent | 98bbf3565e3147a40c583ff97e2b5a98370c21a5 (diff) | |
| download | kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.zip kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.tar.gz kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.tar.bz2 | |
Merge 3.0.67
Change-Id: I269d39317336ca17a0d3a58932744e3d4a861c5d
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/ali5451/ali5451.c | 2 | ||||
| -rw-r--r-- | sound/pci/rme32.c | 2 | ||||
| -rw-r--r-- | sound/usb/quirks-table.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 5c6e322..f71a0ff 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -1435,7 +1435,7 @@ static snd_pcm_uframes_t snd_ali_pointer(struct snd_pcm_substream *substream) spin_lock(&codec->reg_lock); if (!pvoice->running) { - spin_unlock_irq(&codec->reg_lock); + spin_unlock(&codec->reg_lock); return 0; } outb(pvoice->number, ALI_REG(codec, ALI_GC_CIR)); diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index 3c04524..1026820 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c @@ -1017,7 +1017,7 @@ static int snd_rme32_capture_close(struct snd_pcm_substream *substream) spin_lock_irq(&rme32->lock); rme32->capture_substream = NULL; rme32->capture_periodsize = 0; - spin_unlock(&rme32->lock); + spin_unlock_irq(&rme32->lock); return 0; } diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 7ccffb2..11a9f86 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1613,7 +1613,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "Roland", */ /* .product_name = "A-PRO", */ - .ifnum = 1, + .ifnum = 0, .type = QUIRK_MIDI_FIXED_ENDPOINT, .data = & (const struct snd_usb_midi_endpoint_info) { .out_cables = 0x0003, |