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

Commit d15f60ec authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: Add null check for kctl private_data in volume controls"

parents 2a0ab677 d08ab1fd

asoc/msm-pcm-loopback-v2.c

+7 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -568,11 +568,15 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol, 
{

	int rc = 0;

	struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);

	struct snd_pcm_substream *substream =

		vol->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;

	struct snd_pcm_substream *substream = NULL;

	struct msm_pcm_loopback *prtd;



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

	if (!vol) {

		pr_err("%s: vol is NULL\n", __func__);

		return -ENODEV;

	}

	substream = vol->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;

	if ((!substream) || (!substream->runtime)) {

		pr_debug("%s substream or runtime not found\n", __func__);

		rc = -ENODEV;

asoc/msm-pcm-q6-noirq.c

+7 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -720,13 +720,17 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol, 
{

	struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);

	struct msm_plat_data *pdata = NULL;

	struct snd_pcm_substream *substream =

		vol->pcm->streams[vol->stream].substream;

	struct snd_pcm_substream *substream = NULL;

	struct snd_soc_pcm_runtime *soc_prtd = NULL;

	struct snd_soc_component *component = NULL;

	struct msm_audio *prtd;



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

	if (!vol) {

		pr_err("%s: vol is NULL\n", __func__);

		return -ENODEV;

	}

	substream = vol->pcm->streams[vol->stream].substream;

	if (!substream) {

		pr_err("%s substream not found\n", __func__);

		return -ENODEV;

asoc/msm-pcm-q6-v2.c

+7 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */
@@ -1514,13 +1514,17 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol, 
{

	struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);

	struct msm_plat_data *pdata = NULL;

	struct snd_pcm_substream *substream =

		vol->pcm->streams[vol->stream].substream;

	struct snd_pcm_substream *substream = NULL;

	struct snd_soc_pcm_runtime *soc_prtd = NULL;

	struct snd_soc_component *component = NULL;

	struct msm_audio *prtd;



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

	if (!vol) {

		pr_err("%s: vol is NULL\n", __func__);

		return -ENODEV;

	}

	substream = vol->pcm->streams[vol->stream].substream;

	if (!substream) {

		pr_err("%s substream not found\n", __func__);

		return -ENODEV;