diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-02-28 22:47:10 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-28 22:47:10 -0800 |
| commit | 8886dd12ac9b8f26924ef3d94a419d0352cbe8e2 (patch) | |
| tree | e58d96505ae601d5170882db72fb5b016bfcf5a0 | |
| parent | 3ca727af9d7aae56c1e916ab97f4f8d2be856b51 (diff) | |
| parent | da1c3cc5ca3665c12d7917f6f26d62e006f7f420 (diff) | |
Merge "msm: ipa3: Release the IPA lock acquired"
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v2/ipa_rt.c | 4 | ||||
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa_rt.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v2/ipa_rt.c index 4fea1255b360..af8d9dcf8afc 100644 --- a/drivers/platform/msm/ipa/ipa_v2/ipa_rt.c +++ b/drivers/platform/msm/ipa/ipa_v2/ipa_rt.c @@ -1,4 +1,4 @@ -/* 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; } } diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c index 256843022dfe..659d38e90108 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c @@ -1,4 +1,4 @@ -/* 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; } } |