Merge pull request #1232 from HiassofT/socfix-4.4

iqaudio-dac, raspidac3: fix snd_soc_limit_volume call

Author: popcornmix

sound/soc/bcm/iqaudio-dac.c

@@ -27,9 +27,8 @@ static int snd_rpi_iqaudio_dac_init(struct snd_soc_pcm_runtime *rtd)
 {
 	int ret;
 	struct snd_soc_card *card = rtd->card;
-	struct snd_soc_codec *codec = rtd->codec;
 
-	ret = snd_soc_limit_volume(codec, "Digital Playback Volume", 207);
+	ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
 	if (ret < 0)
 		dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
 

sound/soc/bcm/raspidac3.c

@@ -39,7 +39,7 @@ static int snd_rpi_raspidac3_init(struct snd_soc_pcm_runtime *rtd)
 	snd_soc_update_bits(codec, PCM512x_GPIO_OUTPUT_4, 0xf, 0x02);
 	snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x00);
 
-	ret = snd_soc_limit_volume(codec, "Digital Playback Volume", 207);
+	ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
 	if (ret < 0)
 		dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
 	else {
@@ -49,7 +49,7 @@ static int snd_rpi_raspidac3_init(struct snd_soc_pcm_runtime *rtd)
 		if (ret < 0)
 			dev_warn(card->dev, "Failed to add TPA6130A2 controls: %d\n",
 				 ret);
-		ret = snd_soc_limit_volume(codec,
+		ret = snd_soc_limit_volume(card,
 					   "TPA6130A2 Headphone Playback Volume",
 					   54);
 		if (ret < 0)