2 files changed, 8 insertions, 13 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 2dd6bf9b49ed..2d7a42014f51 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -41,12 +41,13 @@ MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MIXER);
 
 static int snd_mixer_oss_open(struct inode *inode, struct file *file)
 {
-        int cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
         struct snd_card *card;
         struct snd_mixer_oss_file *fmixer;
         int err;
 
-        if ((card = snd_cards[cardnum]) == NULL)
+        card = snd_lookup_oss_minor_data(iminor(inode),
+                                         SNDRV_OSS_DEVICE_TYPE_MIXER);
+        if (card == NULL)
                 return -ENODEV;
         if (card->mixer_oss == NULL)
                 return -ENODEV;
@@ -1286,7 +1287,7 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)
                 sprintf(name, "mixer%i%i", card->number, 0);
                 if ((err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,
                                                    card, 0,
-                                                   &snd_mixer_oss_f_ops,
+                                                   &snd_mixer_oss_f_ops, card,
                                                    name)) < 0) {
                         snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",
                                    card->number, 0);
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 947bf08df42a..2ae283c7b28a 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1834,9 +1834,6 @@ static int snd_task_name(struct task_struct *task, char *name, size_t size)
 
 static int snd_pcm_oss_open(struct inode *inode, struct file *file)
 {
-        int minor = iminor(inode);
-        int cardnum = SNDRV_MINOR_OSS_CARD(minor);
-        int device;
         int err;
         char task_name[32];
         struct snd_pcm *pcm;
@@ -1845,11 +1842,8 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
         int nonblock;
         wait_queue_t wait;
 
-        snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO);
-        device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ?
-                adsp_map[cardnum] : dsp_map[cardnum];
-
-        pcm = snd_pcm_devices[(cardnum * SNDRV_PCM_DEVICES) + device];
+        pcm = snd_lookup_oss_minor_data(iminor(inode),
+                                        SNDRV_OSS_DEVICE_TYPE_PCM);
         if (pcm == NULL) {
                 err = -ENODEV;
                 goto __error1;
@@ -1890,7 +1884,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)
         down(&pcm->open_mutex);
         while (1) {
                 err = snd_pcm_oss_open_file(file, pcm, &pcm_oss_file,
-                                            minor, psetup, csetup);
+                                            iminor(inode), psetup, csetup);
                 if (err >= 0)
                         break;
                 if (err == -EAGAIN) {
@@ -2450,7 +2444,7 @@ static void register_oss_dsp(struct snd_pcm *pcm, int index)
         sprintf(name, "dsp%i%i", pcm->card->number, pcm->device);
         if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
                                     pcm->card, index, &snd_pcm_oss_f_reg,
-                                    name) < 0) {
+                                    pcm, name) < 0) {
                 snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",
                            pcm->card->number, pcm->device);
         }