From: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Date: Tue, 29 Mar 2016 11:02:35 +0000 (+0530)
Subject: greybus: audio: Fix widget pointer update during control parsing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6da549ec851117293a07e64f97170f7dc9d55578;p=linux-beck.git

greybus: audio: Fix widget pointer update during control parsing

widget pointer was incorrectly modfied while parsing kcontrol

Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index 4901348a2ada..9e36fb27faf8 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -834,7 +834,7 @@ static int gbaudio_tplg_process_widgets(struct gbaudio_module_info *module,
 		list_add(&widget->list, &module->widget_list);
 		ncontrols = curr->ncontrols;
 		curr++;
-		curr += ncontrols * sizeof(struct gb_audio_control);
+		curr = (void *)curr + ncontrols*sizeof(struct gb_audio_control);
 	}
 	module->dapm_widgets = dapm_widgets;