Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / sound / parisc / harmony.c

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 67f56a2cee6aec83bd4710f645a82cdca9e39847..4b20be79c1ddbb58b2712a03db08227afd5a12ef 100644 (file)
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -959,8 +959,6 @@ snd_harmony_create(struct snd_card *card,
                 goto free_and_ret;
         }
 
-       snd_card_set_dev(card, &padev->dev);
-
        *rchip = h;
 
        return 0;
@@ -977,7 +975,7 @@ snd_harmony_probe(struct parisc_device *padev)
        struct snd_card *card;
        struct snd_harmony *h;
 
-       err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+       err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
        if (err < 0)
                return err;