23 files changed, 96 insertions, 84 deletions
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 9aa9d94891f0..46b47689362c 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -158,6 +158,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file)
 {
        int err = -ENXIO;
        struct snd_hwdep *hw = file->private_data;
+        struct module *mod = hw->card->module;
        mutex_lock(&hw->open_mutex);
        if (hw->ops.release) {
                err = hw->ops.release(hw, file);
@@ -167,7 +168,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file)
                hw->used--;
        snd_card_file_remove(hw->card, file);
        mutex_unlock(&hw->open_mutex);
-        module_put(hw->card->module);
+        module_put(mod);
        return err;
 }
diff --git a/sound/core/hwdep_compat.c b/sound/core/hwdep_compat.c
index 938f77580966..3827c0ceec8f 100644
--- a/sound/core/hwdep_compat.c
+++ b/sound/core/hwdep_compat.c
@@ -33,7 +33,7 @@ struct snd_hwdep_dsp_image32 {
 static int snd_hwdep_dsp_load_compat(struct snd_hwdep *hw,
                                     struct snd_hwdep_dsp_image32 __user *src)
 {
-        struct snd_hwdep_dsp_image *dst;
+        struct snd_hwdep_dsp_image __user *dst;
        compat_caddr_t ptr;
        u32 val;
diff --git a/sound/core/init.c b/sound/core/init.c
index d7607a25acdf..3058d626a90a 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -33,10 +33,10 @@
 #include <sound/control.h>
 #include <sound/info.h>
-struct snd_shutdown_f_ops {
+static DEFINE_SPINLOCK(shutdown_lock);
-        struct file_operations f_ops;
+static LIST_HEAD(shutdown_files);
-        struct snd_shutdown_f_ops *next;
-};
+static struct file_operations snd_shutdown_f_ops;
 static unsigned int snd_cards_lock;     /* locked for registering/using */
 struct snd_card *snd_cards[SNDRV_CARDS];
@@ -198,6 +198,25 @@ static ssize_t snd_disconnect_write(struct file *file, const char __user *buf,
        return -ENODEV;
 }
+static int snd_disconnect_release(struct inode *inode, struct file *file)
+{
+        struct snd_monitor_file *df = NULL, *_df;
+        spin_lock(&shutdown_lock);
+        list_for_each_entry(_df, &shutdown_files, shutdown_list) {
+                if (_df->file == file) {
+                        df = _df;
+                        break;
+                }
+        }
+        spin_unlock(&shutdown_lock);
+        if (likely(df))
+                return df->disconnected_f_op->release(inode, file);
+        panic("%s(%p, %p) failed!", __FUNCTION__, inode, file);
+}
 static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait)
 {
        return POLLERR | POLLNVAL;
@@ -219,6 +238,22 @@ static int snd_disconnect_fasync(int fd, struct file *file, int on)
        return -ENODEV;
 }
+static struct file_operations snd_shutdown_f_ops =
+{
+        .owner =        THIS_MODULE,
+        .llseek =       snd_disconnect_llseek,
+        .read =         snd_disconnect_read,
+        .write =        snd_disconnect_write,
+        .release =      snd_disconnect_release,
+        .poll =         snd_disconnect_poll,
+        .unlocked_ioctl = snd_disconnect_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = snd_disconnect_ioctl,
+#endif
+        .mmap =         snd_disconnect_mmap,
+        .fasync =       snd_disconnect_fasync
+};
 /**
 *  snd_card_disconnect - disconnect all APIs from the file-operations (user space)
 *  @card: soundcard structure
@@ -234,9 +269,6 @@ int snd_card_disconnect(struct snd_card *card)
 {
        struct snd_monitor_file *mfile;
        struct file *file;
-        struct snd_shutdown_f_ops *s_f_ops;
-        struct file_operations *f_ops;
-        const struct file_operations *old_f_ops;
        int err;
        spin_lock(&card->files_lock);
@@ -261,34 +293,14 @@ int snd_card_disconnect(struct snd_card *card)
                /* it's critical part, use endless loop */
                /* we have no room to fail */
-                s_f_ops = kmalloc(sizeof(struct snd_shutdown_f_ops), GFP_ATOMIC);
+                mfile->disconnected_f_op = mfile->file->f_op;
-                if (s_f_ops == NULL)
-                        panic("Atomic allocation failed for snd_shutdown_f_ops!");
-                f_ops = &s_f_ops->f_ops;
-                memset(f_ops, 0, sizeof(*f_ops));
-                f_ops->owner = file->f_op->owner;
-                f_ops->release = file->f_op->release;
-                f_ops->llseek = snd_disconnect_llseek;
-                f_ops->read = snd_disconnect_read;
-                f_ops->write = snd_disconnect_write;
-                f_ops->poll = snd_disconnect_poll;
-                f_ops->unlocked_ioctl = snd_disconnect_ioctl;
-#ifdef CONFIG_COMPAT
-                f_ops->compat_ioctl = snd_disconnect_ioctl;
-#endif
-                f_ops->mmap = snd_disconnect_mmap;
-                f_ops->fasync = snd_disconnect_fasync;
-                s_f_ops->next = card->s_f_ops;
+                spin_lock(&shutdown_lock);
-                card->s_f_ops = s_f_ops;
+                list_add(&mfile->shutdown_list, &shutdown_files);
-                
+                spin_unlock(&shutdown_lock);
-                f_ops = fops_get(f_ops);
-                old_f_ops = file->f_op;
+                fops_get(&snd_shutdown_f_ops);
-                file->f_op = f_ops;     /* must be atomic */
+                mfile->file->f_op = &snd_shutdown_f_ops;
-                fops_put(old_f_ops);
                
                mfile = mfile->next;
        }
@@ -326,8 +338,6 @@ EXPORT_SYMBOL(snd_card_disconnect);
 */
 static int snd_card_do_free(struct snd_card *card)
 {
-        struct snd_shutdown_f_ops *s_f_ops;
 #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
        if (snd_mixer_oss_notify_callback)
                snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_FREE);
@@ -351,11 +361,6 @@ static int snd_card_do_free(struct snd_card *card)
                snd_printk(KERN_WARNING "unable to free card info\n");
                /* Not fatal error */
        }
-        while (card->s_f_ops) {
-                s_f_ops = card->s_f_ops;
-                card->s_f_ops = s_f_ops->next;
-                kfree(s_f_ops);
-        }
        kfree(card);
        return 0;
 }
@@ -670,6 +675,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
        if (mfile == NULL)
                return -ENOMEM;
        mfile->file = file;
+        mfile->disconnected_f_op = NULL;
        mfile->next = NULL;
        spin_lock(&card->files_lock);
        if (card->shutdown) {
@@ -716,6 +722,12 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
                pfile = mfile;
                mfile = mfile->next;
        }
+        if (mfile && mfile->disconnected_f_op) {
+                fops_put(mfile->disconnected_f_op);
+                spin_lock(&shutdown_lock);
+                list_del(&mfile->shutdown_list);
+                spin_unlock(&shutdown_lock);
+        }
        if (card->files == NULL)
                last_close = 1;
        spin_unlock(&card->files_lock);
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 2398d2c55feb..725c115ff97d 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2154,6 +2154,7 @@ static int __devinit snd_audiodrive_pnpc(int dev, struct snd_audiodrive *acard,
        }
        /* Control port initialization */
        if (pnp_activate_dev(acard->devc) < 0) {
+                kfree(cfg);
                snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n");
                return -EAGAIN;
        }
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index 52498c9d411e..c1c69e3cbfd0 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -107,7 +107,7 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus)
 static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
 {
-        struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id;
+        struct snd_gusmax *maxcard = dev_id;
        int loop, max = 5;
        int handled = 0;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 5c474b831edc..f12cd09d1fcc 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -301,7 +301,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,
 static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
 {
-        struct snd_interwave *iwcard = (struct snd_interwave *) dev_id;
+        struct snd_interwave *iwcard = dev_id;
        int loop, max = 5;
        int handled = 0;
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 3bd19c36fcd9..37773b1deea5 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -465,7 +465,7 @@ tas_dmasound_init(void)
                        val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0);
                        pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80);
                        /* Trigger it */
-                        headphone_intr(0,NULL,NULL);
+                        headphone_intr(0, NULL);
                }
        }
        if (!gpio_headphone_irq) {
@@ -1499,7 +1499,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
                                write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol);
                                msleep(150);
                                tas_leave_sleep(); /* Stub for now */
-                                headphone_intr(0,NULL,NULL);
+                                headphone_intr(0, NULL);
                                break;
                        case AWACS_DACA:
                                msleep(10); /* Check this !!! */
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 2562f4769b90..ddf6b0a0bca5 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -1102,7 +1102,7 @@ static void es1371_handle_midi(struct es1371_state *s)
 static irqreturn_t es1371_interrupt(int irq, void *dev_id)
 {
-        struct es1371_state *s = (struct es1371_state *)dev_id;
+        struct es1371_state *s = dev_id;
        unsigned int intsrc, sctl;
        
        /* fastpath out, to ease interrupt sharing */
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index 7807abac0625..784bdd707055 100644
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -372,7 +372,7 @@ static void hal2_adc_interrupt(struct hal2_codec *adc)
 static irqreturn_t hal2_interrupt(int irq, void *dev_id)
 {
-        struct hal2_card *hal2 = (struct hal2_card*)dev_id;
+        struct hal2_card *hal2 = dev_id;
        irqreturn_t ret = IRQ_NONE;
        /* decide what caused this interrupt */
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index a48af879b466..240cc7939b69 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -1525,7 +1525,7 @@ static void i810_channel_interrupt(struct i810_card *card)
 static irqreturn_t i810_interrupt(int irq, void *dev_id)
 {
-        struct i810_card *card = (struct i810_card *)dev_id;
+        struct i810_card *card = dev_id;
        u32 status;
        spin_lock(&card->lock);
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 58d4a5d05a27..e96220541971 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -435,7 +435,7 @@ static void mpu401_input_loop(struct mpu_config *devc)
 static irqreturn_t mpuintr(int irq, void *dev_id)
 {
        struct mpu_config *devc;
-        int dev = (int) dev_id;
+        int dev = (int)(unsigned long) dev_id;
        int handled = 0;
        devc = &dev_conf[dev];
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 8932d89408ef..bb4a0969f461 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -372,7 +372,7 @@ static void vidc_audio_trigger(int dev, int enable_bits)
                        adev->flags |= DMA_ACTIVE;
                        dma_interrupt = vidc_audio_dma_interrupt;
-                        vidc_sound_dma_irq(0, NULL, NULL);
+                        vidc_sound_dma_irq(0, NULL);
                        iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);
                        local_irq_restore(flags);
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 0cd4d6ec9862..6dfb9f4b03ec 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -2235,7 +2235,7 @@ static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status)
 static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)
 {
-        vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id;
+        vwsnd_dev_t *devc = dev_id;
        unsigned int status;
        DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index dc28b111a06d..15be6ba87c82 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -530,7 +530,7 @@ AC97_ENUM("ALC Headphone Mux", wm9711_enum[1]),
 AC97_SINGLE("ALC Headphone Volume", AC97_VIDEO, 7, 7, 1),
 AC97_SINGLE("Out3 Switch", AC97_AUX, 15, 1, 1),
-AC97_SINGLE("Out3 ZC Switch", AC97_AUX, 7, 1, 1),
+AC97_SINGLE("Out3 ZC Switch", AC97_AUX, 7, 1, 0),
 AC97_ENUM("Out3 Mux", wm9711_enum[2]),
 AC97_ENUM("Out3 LR Mux", wm9711_enum[3]),
 AC97_SINGLE("Out3 Volume", AC97_AUX, 0, 31, 1),
@@ -575,13 +575,14 @@ AC97_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
 AC97_SINGLE("ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 AC97_ENUM("Capture Volume Steps", wm9711_enum[6]),
-AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 1),
+AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 1),
 AC97_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
 AC97_SINGLE("Mic 1 to Phone Switch", AC97_MIC, 14, 1, 1),
 AC97_SINGLE("Mic 2 to Phone Switch", AC97_MIC, 13, 1, 1),
 AC97_ENUM("Mic Select Source", wm9711_enum[7]),
-AC97_SINGLE("Mic 1 Volume", AC97_MIC, 8, 32, 1),
+AC97_SINGLE("Mic 1 Volume", AC97_MIC, 8, 31, 1),
+AC97_SINGLE("Mic 2 Volume", AC97_MIC, 0, 31, 1),
 AC97_SINGLE("Mic 20dB Boost Switch", AC97_MIC, 7, 1, 0),
 AC97_SINGLE("Master ZC Switch", AC97_MASTER, 7, 1, 0),
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index ef189d7f09d3..6ed5ad59f5b5 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -128,6 +128,7 @@ static int snd_vortex_dev_free(struct snd_device *device)
        // Take down PCI interface.
        synchronize_irq(vortex->irq);
        free_irq(vortex->irq, vortex);
+        iounmap(vortex->mmio);
        pci_release_regions(vortex->pci_dev);
        pci_disable_device(vortex->pci_dev);
        kfree(vortex);
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index be65d4db8e27..8058059c56e9 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1461,8 +1461,8 @@ void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)
        /* resore for spdif */
        if (emu->audigy)
-                outl(emu->port + A_IOCFG, emu->saved_a_iocfg);
+                outl(emu->saved_a_iocfg, emu->port + A_IOCFG);
-        outl(emu->port + HCFG, emu->saved_hcfg);
+        outl(emu->saved_hcfg, emu->port + HCFG);
        val = emu->saved_ptr;
        for (reg = saved_regs; *reg != 0xff; reg++)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a76a778d0a1f..feeed12920b4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1682,6 +1682,7 @@ static struct pci_device_id azx_ids[] = {
        { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */
        { 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 026c */
        { 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 0371 */
+        { 0x10de, 0x03f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 03f0 */
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index d08d2e399c8f..84a3eb8aacc2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5076,6 +5076,10 @@ static struct hda_board_config alc883_cfg_tbl[] = {
        { .modelname = "acer", .config = ALC883_ACER },
        { .pci_subvendor = 0x1025, .pci_subdevice = 0/*0x0102*/,
          .config = ALC883_ACER },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0102,
+          .config = ALC883_ACER },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x009f,
+          .config = ALC883_ACER },
        { .modelname = "auto", .config = ALC883_AUTO },
        {}
 };
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index 76ec3d75fa9e..cc87dff1eb56 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -297,8 +297,13 @@ static int patch_si3054(struct hda_codec *codec)
 struct hda_codec_preset snd_hda_preset_si3054[] = {
        { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
        { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x11c11040, .name = "Si3054", .patch = patch_si3054 },
        { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x11c13055, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x11c13155, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x10573055, .name = "Si3054", .patch = patch_si3054 },
        { .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x10573155, .name = "Si3054", .patch = patch_si3054 },
        {}
 };
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 398aa10a06e8..fa8cd8cecc21 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -1124,9 +1124,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
        u32 doorbellValue;
        struct snd_korg1212 *korg1212 = dev_id;
-        if(irq != korg1212->irq)
-                return IRQ_NONE;
        doorbellValue = readl(korg1212->inDoorbellPtr);
        if (!doorbellValue)
@@ -1140,7 +1137,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
        korg1212->inIRQ++;
        switch (doorbellValue) {
                case K1212_DB_DSPDownloadDone:
                        K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n",
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
index 732263e4a437..5bd69206ba65 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -22,6 +22,7 @@
 #include <sound/core.h>
 #include "pdaudiocf.h"
 #include <sound/initval.h>
+#include <asm/irq_regs.h>
 /*
 *
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index e662281a751a..367f8a32a665 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct urb *urb)
                usX2Y_error_urb_status(usX2Y, subs, urb);
                return;
        }
-        if (likely((0xFFFF & urb->start_frame) == usX2Y->wait_iso_frame))
+        if (likely(urb->start_frame == usX2Y->wait_iso_frame))
                subs->completed_urb = urb;
        else {
                usX2Y_error_sequence(usX2Y, subs, urb);
@@ -335,13 +335,9 @@ static void i_usX2Y_urb_complete(struct urb *urb)
                    atomic_read(&capsubs->state) >= state_PREPARED &&
                    (playbacksubs->completed_urb ||
                     atomic_read(&playbacksubs->state) < state_PREPARED)) {
-                        if (!usX2Y_usbframe_complete(capsubs, playbacksubs, urb->start_frame)) {
+                        if (!usX2Y_usbframe_complete(capsubs, playbacksubs, urb->start_frame))
-                                if (nr_of_packs() <= urb->start_frame &&
+                                usX2Y->wait_iso_frame += nr_of_packs();
-                                    urb->start_frame <= (2 * nr_of_packs() - 1))        // uhci and ohci
+                        else {
-                                        usX2Y->wait_iso_frame = urb->start_frame - nr_of_packs();
-                                else
-                                        usX2Y->wait_iso_frame +=  nr_of_packs();
-                        } else {
                                snd_printdd("\n");
                                usX2Y_clients_stop(usX2Y);
                        }
@@ -495,7 +491,6 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs)
                if (subs != NULL && atomic_read(&subs->state) >= state_PREPARED)
                        goto start;
        }
-        usX2Y->wait_iso_frame = -1;
 start:
        usX2Y_subs_startup(subs);
@@ -516,10 +511,9 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs)
                                snd_printk (KERN_ERR "cannot submit datapipe for urb %d, err = %d\n", i, err);
                                err = -EPIPE;
                                goto cleanup;
-                        } else {
+                        } else
-                                if (0 > usX2Y->wait_iso_frame)
+                                if (i == 0)
                                        usX2Y->wait_iso_frame = urb->start_frame;
-                        }
                        urb->transfer_flags = 0;
                } else {
                        atomic_set(&subs->state, state_STARTING1);
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 9acef9d90543..8f3e35e24e72 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb)
                usX2Y_error_urb_status(usX2Y, subs, urb);
                return;
        }
-        if (likely((0xFFFF & urb->start_frame) == usX2Y->wait_iso_frame))
+        if (likely(urb->start_frame == usX2Y->wait_iso_frame))
                subs->completed_urb = urb;
        else {
                usX2Y_error_sequence(usX2Y, subs, urb);
@@ -256,13 +256,9 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb)
        if (capsubs->completed_urb && atomic_read(&capsubs->state) >= state_PREPARED &&
            (NULL == capsubs2 || capsubs2->completed_urb) &&
            (playbacksubs->completed_urb || atomic_read(&playbacksubs->state) < state_PREPARED)) {
-                if (!usX2Y_usbpcm_usbframe_complete(capsubs, capsubs2, playbacksubs, urb->start_frame)) {
+                if (!usX2Y_usbpcm_usbframe_complete(capsubs, capsubs2, playbacksubs, urb->start_frame))
-                        if (nr_of_packs() <= urb->start_frame &&
+                        usX2Y->wait_iso_frame += nr_of_packs();
-                            urb->start_frame <= (2 * nr_of_packs() - 1))        // uhci and ohci
+                else {
-                                usX2Y->wait_iso_frame = urb->start_frame - nr_of_packs();
-                        else
-                                usX2Y->wait_iso_frame +=  nr_of_packs();
-                } else {
                        snd_printdd("\n");
                        usX2Y_clients_stop(usX2Y);
                }
@@ -433,7 +429,6 @@ static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs)
                if (subs != NULL && atomic_read(&subs->state) >= state_PREPARED)
                        goto start;
        }
-        usX2Y->wait_iso_frame = -1;
 start:
        usX2Y_usbpcm_subs_startup(subs);
@@ -459,7 +454,7 @@ static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs)
                                                goto cleanup;
                                        }  else {
                                                snd_printdd("%i\n", urb->start_frame);
-                                                if (0 > usX2Y->wait_iso_frame)
+                                                if (u == 0)
                                                        usX2Y->wait_iso_frame = urb->start_frame;
                                        }
                                        urb->transfer_flags = 0;
@@ -632,7 +627,7 @@ static int usX2Y_pcms_lock_check(struct snd_card *card)
                for (s = 0; s < 2; ++s) {
                        struct snd_pcm_substream *substream;
                        substream = pcm->streams[s].substream;
-                        if (SUBSTREAM_BUSY(substream))
+                        if (substream && SUBSTREAM_BUSY(substream))
                                err = -EBUSY;
                }
        }