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

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

Merge "msm: ipa: Fix the force_coals command stuck issue on AP suspend"

parents 33a59ce6 dfdf2cad

drivers/platform/msm/ipa/ipa_api.c

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

/*

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

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

 */



#include <linux/ipa.h>
@@ -3738,7 +3738,7 @@ int ipa_get_prot_id(enum ipa_client_type client) 
EXPORT_SYMBOL(ipa_get_prot_id);



static const struct dev_pm_ops ipa_pm_ops = {

	.suspend_noirq = ipa_ap_suspend,

	.suspend = ipa_ap_suspend,

	.resume_noirq = ipa_ap_resume,

};

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

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

/*

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

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

 */



/*
@@ -2699,7 +2699,7 @@ static const struct of_device_id rmnet_ipa_dt_match[] = { 
MODULE_DEVICE_TABLE(of, rmnet_ipa_dt_match);



static const struct dev_pm_ops rmnet_ipa_pm_ops = {

	.suspend_noirq = rmnet_ipa_ap_suspend,

	.suspend = rmnet_ipa_ap_suspend,

	.resume_noirq = rmnet_ipa_ap_resume,

};