Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: ca0106 - Fix the max capture buffer size
  ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
  ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock

diff --combined sound/pci/ca0106/ca0106_main.c
index f24bf1ecb36d1fa060fda9d817d17a872b11e774,700f15ea16d4431e8075c296bc8b2dd94dc57893..15e4138bce17ea4b42b2904bbe29b43095252d38
--- 1/sound/pci/ca0106/ca0106_main.c
--- 2/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@@ -325,9 -325,9 +325,9 @@@ static struct snd_pcm_hardware snd_ca01
        .rate_max =             192000,
        .channels_min =         2,
        .channels_max =         2,
-       .buffer_bytes_max =     ((65536 - 64) * 8),
+       .buffer_bytes_max =     65536 - 128,
        .period_bytes_min =     64,
-       .period_bytes_max =     (65536 - 64),
+       .period_bytes_max =     32768 - 64,
        .periods_min =          2,
        .periods_max =          2,
        .fifo_size =            0,
@@@ -1876,7 -1876,7 +1876,7 @@@ static int snd_ca0106_resume(struct pci
  
  // PCI IDs
  static struct pci_device_id snd_ca0106_ids[] = {
 -      { 0x1102, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* Audigy LS or Live 24bit */
 +      { PCI_VDEVICE(CREATIVE, 0x0007), 0 },   /* Audigy LS or Live 24bit */
        { 0, }
  };
  MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);