Merge branch 'for-next' into for-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
index 858023cf4298..2dba848a781f 100644
--- a/sound/firewire/scs1x.c
+++ b/sound/firewire/scs1x.c
@@ -391,10 +391,10 @@ static int scs_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
         struct scs *scs;
         int err;
 
-        err = snd_card_create(-16, NULL, THIS_MODULE, sizeof(*scs), &card);
+        err = snd_card_new(&unit->device, -16, NULL, THIS_MODULE,
+                           sizeof(*scs), &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, &unit->device);
 
         scs = card->private_data;
         scs->card = card;