summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/audio_topology.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/greybus/audio_topology.c')
-rw-r--r--drivers/staging/greybus/audio_topology.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index f9f33817a092..b6251691a33d 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -172,7 +172,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
info = (struct gb_audio_ctl_elem_info *)data->info;
if (!info) {
- dev_err(module->dev, "NULL info for %s\n", uinfo->id.name);
+ dev_err(codec->dev, "NULL info for %s\n", uinfo->id.name);
return -EINVAL;
}
@@ -489,10 +489,11 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,
dev_err_ratelimited(codec->dev,
"%d:Error in %s for %s\n", ret,
__func__, kcontrol->id.name);
+ return ret;
}
}
- return ret;
+ return 0;
}
#define SOC_DAPM_MIXER_GB(xname, kcount, data) \