Merge tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / hid / hid-prodikeys.c

diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 7ed82805641477e5556dff5f12898f2f42095559..91fab975063ce889b1ceae0bafbab2273d77186b 100644 (file)
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -624,7 +624,8 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
 
        /* Setup sound card */
 
-       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+       err = snd_card_new(&pm->pk->hdev->dev, index[dev], id[dev],
+                          THIS_MODULE, 0, &card);
        if (err < 0) {
                pk_error("failed to create pc-midi sound card\n");
                err = -ENOMEM;
@@ -660,8 +661,6 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
        snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT,
                &pcmidi_in_ops);
 
-       snd_card_set_dev(card, &pm->pk->hdev->dev);
-
        /* create sysfs variables */
        err = device_create_file(&pm->pk->hdev->dev,
                                 sysfs_device_attr_channel);