diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:23:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 02:13:31 -0500 |
commit | 06b45f00a46621e0766e37a02a9676b9143261a2 (patch) | |
tree | 51b808f985a4eac75adc2208dd31016acd43ac29 /sound/firewire/speakers.c | |
parent | 874b8d422e26e21dd432657e25f679c75440c1bc (diff) |
ALSA: firewire: Convert to snd_card_new() with a device pointer
Also remove superfluous snd_card_set_dev() calls.
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/speakers.c')
-rw-r--r-- | sound/firewire/speakers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index cc8bc3a51bc1..9f7ef219b109 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c | |||
@@ -668,10 +668,10 @@ static int fwspk_probe(struct fw_unit *unit, | |||
668 | u32 firmware; | 668 | u32 firmware; |
669 | int err; | 669 | int err; |
670 | 670 | ||
671 | err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*fwspk), &card); | 671 | err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE, |
672 | sizeof(*fwspk), &card); | ||
672 | if (err < 0) | 673 | if (err < 0) |
673 | return err; | 674 | return err; |
674 | snd_card_set_dev(card, &unit->device); | ||
675 | 675 | ||
676 | fwspk = card->private_data; | 676 | fwspk = card->private_data; |
677 | fwspk->card = card; | 677 | fwspk->card = card; |