Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

1 files changed, 5 insertions, 2 deletions

diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index de39d212bc15..e401c6703297 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -98,6 +98,7 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t *
         int cidx = SNDRV_MINOR_OSS_CARD(minor);
         int track2 = -1;
         int register1 = -1, register2 = -1;
+        struct device *carddev = NULL;
 
         if (minor < 0)
                 return minor;
@@ -121,11 +122,13 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t *
                 track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
                 break;
         }
-        register1 = register_sound_special(reg->f_ops, minor);
+        if (card)
+                carddev = card->dev;
+        register1 = register_sound_special_device(reg->f_ops, minor, carddev);
         if (register1 != minor)
                 goto __end;
         if (track2 >= 0) {
-                register2 = register_sound_special(reg->f_ops, track2);
+                register2 = register_sound_special_device(reg->f_ops, track2, carddev);
                 if (register2 != track2)
                         goto __end;
         }