diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-07-24 18:08:13 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-24 18:08:13 (GMT) |
| commit | 43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa (patch) | |
| tree | 1057babea8807af3f4a3c44fd116b7bbe99eb733 /sound/soc/sh/migor.c | |
| parent | cba59972a1191a0c1647a52fe745eed7a4b34b38 (diff) | |
| parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
| download | linux-43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa.tar.xz | |
Merge tag 'asoc-fix-v4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'sound/soc/sh/migor.c')
| -rw-r--r-- | sound/soc/sh/migor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 82f5823..672bcd4 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -162,12 +162,11 @@ static int __init migor_init(void) if (ret < 0) return ret; - siumckb_lookup = clkdev_alloc(&siumckb_clk, "siumckb_clk", NULL); + siumckb_lookup = clkdev_create(&siumckb_clk, "siumckb_clk", NULL); if (!siumckb_lookup) { ret = -ENOMEM; goto eclkdevalloc; } - clkdev_add(siumckb_lookup); /* Port number used on this machine: port B */ migor_snd_device = platform_device_alloc("soc-audio", 1); |