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

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

Merge "msm: ipa: Error prints are misleading fix it"

parents cca3c14e bbff7311

drivers/platform/msm/ipa/ipa_v2/ipa.c

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

/* Copyright (c) 2012-2018, 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
@@ -3883,7 +3883,7 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 


	ipa_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", 0);

	if (ipa_ctx->logbuf == NULL)

		IPAERR("failed to create IPC log, continue...\n");

		IPADBG("failed to create IPC log, continue...\n");



	ipa_ctx->pdev = ipa_dev;

	ipa_ctx->uc_pdev = ipa_dev;

drivers/platform/msm/ipa/ipa_v2/ipa_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1901,7 +1901,7 @@ static ssize_t ipa_enable_ipc_low(struct file *file, 
				ipc_log_context_create(IPA_IPC_LOG_PAGES,

				"ipa_low", 0);

			if (ipa_ipc_low_buff == NULL)

				IPAERR("failed to get logbuf_low\n");

				IPADBG("failed to get logbuf_low\n");

		}

		ipa_ctx->logbuf_low = ipa_ipc_low_buff;

	} else {

drivers/platform/msm/ipa/ipa_v3/ipa.c

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

/* Copyright (c) 2012-2018, 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
@@ -4549,7 +4549,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 


	ipa3_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", 0);

	if (ipa3_ctx->logbuf == NULL)

		IPAERR("failed to create IPC log, continue...\n");

		IPADBG("failed to create IPC log, continue...\n");



	ipa3_ctx->pdev = ipa_dev;

	ipa3_ctx->uc_pdev = ipa_dev;

drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ static ssize_t ipa3_enable_ipc_low(struct file *file, 
					"ipa_low", 0);

		}

			if (ipa_ipc_low_buff == NULL)

				IPAERR("failed to get logbuf_low\n");

				IPADBG("failed to get logbuf_low\n");

		ipa3_ctx->logbuf_low = ipa_ipc_low_buff;

	} else {

		ipa3_ctx->logbuf_low = NULL;