Merge tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux

[sfrench/cifs-2.6.git] / sound / firewire / isight.c

diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index fd42e6b315e69d90e39deda16d553fc0baf97395..7ac94439e7584d8e973796dbc07a7032909f64c9 100644 (file)
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -631,10 +631,10 @@ static int isight_probe(struct fw_unit *unit,
        struct isight *isight;
        int err;
 
-       err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*isight), &card);
+       err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
+                          sizeof(*isight), &card);
        if (err < 0)
                return err;
-       snd_card_set_dev(card, &unit->device);
 
        isight = card->private_data;
        isight->card = card;