Patched in Tegra support.

3 files changed, 7 insertions, 26 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index e8a1d18774b..d8359cfeca1 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/string.h>
-#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/control.h>
@@ -52,19 +51,14 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)
                                          SNDRV_OSS_DEVICE_TYPE_MIXER);
         if (card == NULL)
                 return -ENODEV;
-        if (card->mixer_oss == NULL) {
-                snd_card_unref(card);
+        if (card->mixer_oss == NULL)
                 return -ENODEV;
-        }
         err = snd_card_file_add(card, file);
-        if (err < 0) {
-                snd_card_unref(card);
+        if (err < 0)
                 return err;
-        }
         fmixer = kzalloc(sizeof(*fmixer), GFP_KERNEL);
         if (fmixer == NULL) {
                 snd_card_file_remove(card, file);
-                snd_card_unref(card);
                 return -ENOMEM;
         }
         fmixer->card = card;
@@ -73,10 +67,8 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)
         if (!try_module_get(card->module)) {
                 kfree(fmixer);
                 snd_card_file_remove(card, file);
-                snd_card_unref(card);
                 return -EFAULT;
         }
-        snd_card_unref(card);
         return 0;
 }
 
@@ -507,7 +499,7 @@ static struct snd_kcontrol *snd_mixer_oss_test_id(struct snd_mixer_oss *mixer, c
         
         memset(&id, 0, sizeof(id));
         id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strlcpy(id.name, name, sizeof(id.name));
+        strcpy(id.name, name);
         id.index = index;
         return snd_ctl_find_id(card, &id);
 }
@@ -1053,7 +1045,6 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
                         
                 if (kctl->info(kctl, uinfo)) {
                         up_read(&mixer->card->controls_rwsem);
-                        kfree(uinfo);
                         return 0;
                 }
                 strcpy(str, ptr->name);
@@ -1069,7 +1060,6 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
                                 uinfo->value.enumerated.item = slot.capture_item;
                                 if (kctl->info(kctl, uinfo)) {
                                         up_read(&mixer->card->controls_rwsem);
-                                        kfree(uinfo);
                                         return 0;
                                 }
                                 if (!strcmp(uinfo->value.enumerated.name, str)) {
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 4c1cc51772e..23c34a02894 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -30,7 +30,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/vmalloc.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 #include <sound/core.h>
@@ -47,7 +47,7 @@
 
 static int dsp_map[SNDRV_CARDS];
 static int adsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
-static bool nonblock_open = 1;
+static int nonblock_open = 1;
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Abramo Bagnara <abramo@alsa-project.org>");
 MODULE_DESCRIPTION("PCM OSS emulation for ALSA.");
@@ -2441,10 +2441,6 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
                 mutex_unlock(&pcm->open_mutex);
                 schedule();
                 mutex_lock(&pcm->open_mutex);
-                if (pcm->card->shutdown) {
-                        err = -ENODEV;
-                        break;
-                }
                 if (signal_pending(current)) {
                         err = -ERESTARTSYS;
                         break;
@@ -2454,7 +2450,6 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
         mutex_unlock(&pcm->open_mutex);
         if (err < 0)
                 goto __error;
-        snd_card_unref(pcm->card);
         return err;
 
       __error:
@@ -2462,8 +2457,6 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
       __error2:
         snd_card_file_remove(pcm->card, file);
       __error1:
-        if (pcm)
-                snd_card_unref(pcm->card);
         return err;
 }
 
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 727ac44d39f..71cc3ddf5c1 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -199,13 +199,12 @@ int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin)
 snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pcm_uframes_t drv_frames)
 {
         struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;
-        int stream;
+        int stream = snd_pcm_plug_stream(plug);
 
         if (snd_BUG_ON(!plug))
                 return -ENXIO;
         if (drv_frames == 0)
                 return 0;
-        stream = snd_pcm_plug_stream(plug);
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 plugin = snd_pcm_plug_last(plug);
                 while (plugin && drv_frames > 0) {
@@ -231,14 +230,13 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pc
 {
         struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;
         snd_pcm_sframes_t frames;
-        int stream;
+        int stream = snd_pcm_plug_stream(plug);
         
         if (snd_BUG_ON(!plug))
                 return -ENXIO;
         if (clt_frames == 0)
                 return 0;
         frames = clt_frames;
-        stream = snd_pcm_plug_stream(plug);
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 plugin = snd_pcm_plug_first(plug);
                 while (plugin && frames > 0) {