Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93974768 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: use separate variable for Tx bit rate"

parents ffb3186a 9b07e6a6

sound/soc/msm/msm8994.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -93,6 +93,7 @@ struct msm8994_asoc_mach_data { 


static int slim0_rx_sample_rate = SAMPLING_RATE_48KHZ;

static int slim0_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int slim0_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int hdmi_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int msm8994_auxpcm_rate = 8000;
@@ -1502,7 +1503,7 @@ static int msm_slim_0_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 


	pr_debug("%s()\n", __func__);

	param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

				   slim0_rx_bit_format);

				   slim0_tx_bit_format);

	rate->min = rate->max = 48000;

	channels->min = channels->max = msm_slim_0_tx_ch;