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

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

Merge "msm: ipa3: Release the IPA lock acquired"

parents 3ca727af da1c3cc5

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

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

/* Copyright (c) 2012-2019, 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
@@ -1404,6 +1404,7 @@ int ipa2_reset_rt(enum ipa_ip_type ip, bool user_only) 
					hdr_entry->cookie != IPA_HDR_COOKIE) {

						IPAERR_RL(

						"Header already deleted\n");

						mutex_unlock(&ipa_ctx->lock);

						return -EINVAL;

					}

				} else if (rule->proc_ctx) {
@@ -1415,6 +1416,7 @@ int ipa2_reset_rt(enum ipa_ip_type ip, bool user_only) 
							IPA_PROC_HDR_COOKIE) {

					IPAERR_RL(

						"Proc entry already deleted\n");

						mutex_unlock(&ipa_ctx->lock);

						return -EINVAL;

					}

				}

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

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

/* Copyright (c) 2012-2019, 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
@@ -1548,6 +1548,7 @@ int ipa3_reset_rt(enum ipa_ip_type ip, bool user_only) 
					hdr_entry->cookie != IPA_HDR_COOKIE) {

						IPAERR_RL(

						"Header already deleted\n");

						mutex_unlock(&ipa3_ctx->lock);

						return -EINVAL;

					}

				} else if (rule->proc_ctx) {
@@ -1559,6 +1560,7 @@ int ipa3_reset_rt(enum ipa_ip_type ip, bool user_only) 
							IPA_PROC_HDR_COOKIE) {

						IPAERR_RL(

						"Proc entry already deleted\n");

						mutex_unlock(&ipa3_ctx->lock);

						return -EINVAL;

					}

				}