X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=sound%2Fsoc%2Fsoc-topology.c;h=70396d3f64728bad98d7f5a665ebfb66351bfdf9;hb=11d2c48e817d331a87efc4d45bdf510351198628;hp=cce63fe65dd97ccb8dcb2b2362da6eb81319954f;hpb=642eb0664157aa5cffb1bb3d0161d8d645946403;p=firefly-linux-kernel-4.4.55.git

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index cce63fe65dd9..70396d3f6472 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -531,7 +531,7 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr,
 		/* TLV bytes controls need standard kcontrol info handler,
 		 * TLV callback and extended put/get handlers.
 		 */
-		k->info = snd_soc_bytes_info;
+		k->info = snd_soc_bytes_info_ext;
 		k->tlv.c = snd_soc_bytes_tlv_callback;
 
 		ext_ops = tplg->bytes_ext_ops;
@@ -1484,6 +1484,7 @@ widget:
 	if (widget == NULL) {
 		dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n",
 			w->name);
+		ret = -ENOMEM;
 		goto hdr_err;
 	}