Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "asoc: bolero: Fix compile errors on rx/tx macro"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-02 23:45:43 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2e628184b9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
asoc/codecs/bolero/rx-macro.c
View file

@ -883,7 +883,8 @@ static int rx_macro_set_idle_detect_thr(struct snd_soc_codec *codec,
int interp, int path_type)
{
int port_id[4] = { 0, 0, 0, 0 };
int *port_ptr = NULL, num_ports = NULL;
int *port_ptr = NULL;
int num_ports = 0;
int bit_width = 0, i = 0;
int mux_reg = 0, mux_reg_val = 0;
int dai_id = 0, idle_thr = 0;

6
asoc/codecs/bolero/tx-macro.c
View file

@ -182,8 +182,8 @@ static int tx_macro_mclk_enable(struct tx_macro_priv *tx_priv,
struct regmap *regmap = dev_get_regmap(tx_priv->dev->parent, NULL);
int ret = 0;
dev_dbg(tx_priv->dev, "%s: mclk_enable = %u, dapm = %d clk_users= %d\n",
__func__, mclk_enable, dapm, tx_priv->tx_mclk_users);
dev_dbg(tx_priv->dev, "%s: mclk_enable = %u,clk_users= %d\n",
__func__, mclk_enable, tx_priv->tx_mclk_users);
mutex_lock(&tx_priv->mclk_lock);
if (mclk_enable) {
@ -631,7 +631,7 @@ static int tx_macro_hw_params(struct snd_pcm_substream *substream,
int tx_fs_rate = -EINVAL;
struct snd_soc_codec *codec = dai->codec;
u32 decimator = 0;
u16 sample_rate = 0;
u32 sample_rate = 0;
u16 tx_fs_reg = 0;
struct device *tx_dev = NULL;
struct tx_macro_priv *tx_priv = NULL;