diff --git a/sound/soc/tegra-alt/tegra186_dspk_alt.c b/sound/soc/tegra-alt/tegra186_dspk_alt.c
index fe13f1b6..784e26e9 100644
--- a/sound/soc/tegra-alt/tegra186_dspk_alt.c
+++ b/sound/soc/tegra-alt/tegra186_dspk_alt.c
@@ -187,7 +187,7 @@ static int tegra186_dspk_startup(struct snd_pcm_substream *substream,
 	}
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (!IS_ERR(dspk->pin_active_state)) {
+		if (!IS_ERR_OR_NULL(dspk->pin_active_state)) {
 			ret = pinctrl_select_state(dspk->pinctrl,
 						dspk->pin_active_state);
 			if (ret < 0) {
@@ -209,7 +209,7 @@ static void tegra186_dspk_shutdown(struct snd_pcm_substream *substream,
 	int ret;
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (!IS_ERR(dspk->pin_idle_state)) {
+		if (!IS_ERR_OR_NULL(dspk->pin_idle_state)) {
 			ret = pinctrl_select_state(
 				dspk->pinctrl, dspk->pin_idle_state);
 			if (ret < 0) {
diff --git a/sound/soc/tegra-alt/tegra210_dmic_alt.c b/sound/soc/tegra-alt/tegra210_dmic_alt.c
index f807214a..fdc91447 100644
--- a/sound/soc/tegra-alt/tegra210_dmic_alt.c
+++ b/sound/soc/tegra-alt/tegra210_dmic_alt.c
@@ -223,7 +223,7 @@ static int tegra210_dmic_startup(struct snd_pcm_substream *substream,
 	}
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (!IS_ERR(dmic->pin_active_state)) {
+		if (!IS_ERR_OR_NULL(dmic->pin_active_state)) {
 			ret = pinctrl_select_state(dmic->pinctrl,
 						dmic->pin_active_state);
 			if (ret < 0) {
@@ -244,7 +244,7 @@ static void tegra210_dmic_shutdown(struct snd_pcm_substream *substream,
 	int ret;
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (!IS_ERR(dmic->pin_idle_state)) {
+		if (!IS_ERR_OR_NULL(dmic->pin_idle_state)) {
 			ret = pinctrl_select_state(
 				dmic->pinctrl, dmic->pin_idle_state);
 			if (ret < 0)
diff --git a/sound/soc/tegra-alt/tegra210_i2s_alt.c b/sound/soc/tegra-alt/tegra210_i2s_alt.c
index ddb0d9b2..6f23c5c5 100644
--- a/sound/soc/tegra-alt/tegra210_i2s_alt.c
+++ b/sound/soc/tegra-alt/tegra210_i2s_alt.c
@@ -496,7 +496,7 @@ static int tegra210_i2s_startup(struct snd_pcm_substream *substream,
 			}
 		}
 
-		if (!IS_ERR(i2s->pin_default_state)) {
+		if (!IS_ERR_OR_NULL(i2s->pin_default_state)) {
 			ret = pinctrl_select_state(i2s->pinctrl,
 						i2s->pin_default_state);
 			if (ret < 0) {
@@ -525,7 +525,7 @@ static void tegra210_i2s_shutdown(struct snd_pcm_substream *substream,
 	int ret;
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (!IS_ERR(i2s->pin_idle_state)) {
+		if (!IS_ERR_OR_NULL(i2s->pin_idle_state)) {
 			ret = pinctrl_select_state(
 				i2s->pinctrl, i2s->pin_idle_state);
 			if (ret < 0) {