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

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

Merge "ASoC: qcom: qdsp6v2: Initialize locks before use"

parents 14f61d00 68d6b7ac

drivers/misc/qcom/qdsp6v2/audio_aac.c

+6 −6
Original line number Diff line number Diff line
@@ -379,7 +379,12 @@ static int audio_open(struct inode *inode, struct file *file) 
		kfree(audio);

		return -ENOMEM;

	}



	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}

	/* open in T/NT mode */

	if ((file->f_mode & FMODE_WRITE) && (file->f_mode & FMODE_READ)) {

		rc = q6asm_open_read_write(audio->ac, FORMAT_LINEAR_PCM,
@@ -408,11 +413,6 @@ static int audio_open(struct inode *inode, struct file *file) 
		rc = -EACCES;

		goto fail;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("audio_aio_open rc=%d\n", rc);

		goto fail;

	}



#ifdef CONFIG_DEBUG_FS

	snprintf(name, sizeof name, "msm_aac_%04x", audio->ac->session);

drivers/misc/qcom/qdsp6v2/audio_amrnb.c

+7 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

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

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

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -91,7 +91,12 @@ static int audio_open(struct inode *inode, struct file *file) 
		kfree(audio);

		return -ENOMEM;

	}



	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}

	/* open in T/NT mode */

	if ((file->f_mode & FMODE_WRITE) && (file->f_mode & FMODE_READ)) {

		rc = q6asm_open_read_write(audio->ac, FORMAT_LINEAR_PCM,
@@ -119,11 +124,6 @@ static int audio_open(struct inode *inode, struct file *file) 
		rc = -EACCES;

		goto fail;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("audio_aio_open rc=%d\n", rc);

		goto fail;

	}



#ifdef CONFIG_DEBUG_FS

	snprintf(name, sizeof name, "msm_amrnb_%04x", audio->ac->session);

drivers/misc/qcom/qdsp6v2/audio_amrwb.c

+7 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

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

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

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -93,6 +93,12 @@ static int audio_open(struct inode *inode, struct file *file) 
		kfree(audio);

		return -ENOMEM;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}



	/* open in T/NT mode */

	if ((file->f_mode & FMODE_WRITE) && (file->f_mode & FMODE_READ)) {
@@ -121,11 +127,6 @@ static int audio_open(struct inode *inode, struct file *file) 
		rc = -EACCES;

		goto fail;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("audio_aio_open rc=%d\n", rc);

		goto fail;

	}



#ifdef CONFIG_DEBUG_FS

	snprintf(name, sizeof name, "msm_amrwb_%04x", audio->ac->session);

drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c

+6 −5
Original line number Diff line number Diff line
@@ -312,6 +312,12 @@ static int audio_open(struct inode *inode, struct file *file) 
		kfree(audio);

		return -ENOMEM;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}



	/* open in T/NT mode */

	if ((file->f_mode & FMODE_WRITE) && (file->f_mode & FMODE_READ)) {
@@ -340,11 +346,6 @@ static int audio_open(struct inode *inode, struct file *file) 
		rc = -EACCES;

		goto fail;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("audio_aio_open rc=%d\n", rc);

		goto fail;

	}



	config_debug_fs(audio);

	pr_debug("%s: AMRWBPLUS dec success mode[%d]session[%d]\n", __func__,

drivers/misc/qcom/qdsp6v2/audio_evrc.c

+7 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

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

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

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -99,6 +99,12 @@ static int audio_open(struct inode *inode, struct file *file) 
		kfree(audio);

		return -ENOMEM;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}



	/* open in T/NT mode */

	if ((file->f_mode & FMODE_WRITE) && (file->f_mode & FMODE_READ)) {
@@ -127,11 +133,6 @@ static int audio_open(struct inode *inode, struct file *file) 
		rc = -EACCES;

		goto fail;

	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("audio_aio_open rc=%d\n", rc);

		goto fail;

	}



#ifdef CONFIG_DEBUG_FS

	snprintf(name, sizeof name, "msm_evrc_%04x", audio->ac->session);