diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-11-26 13:26:29 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-11-26 13:45:19 -0800 |
| commit | 93d5404e8988882bd33f6acc0d343c4db51eb8b4 (patch) | |
| tree | dd08a576dab4d61fda56dd005c7b2d0001a04297 /drivers/net/ipa/ipa_main.c | |
| parent | af22d0550705dcb4142362b232f972bfab486b89 (diff) | |
| parent | c5c17547b778975b3d83a73c8d84e8fb5ecf3ba5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ipa/ipa_main.c
8afc7e471ad3 ("net: ipa: separate disabling setup from modem stop")
76b5fbcd6b47 ("net: ipa: kill ipa_modem_init()")
Duplicated include, drop one.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ipa/ipa_main.c')
| -rw-r--r-- | drivers/net/ipa/ipa_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 6960efbe66dd..3757ce3de2c5 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -28,8 +28,8 @@ #include "ipa_reg.h" #include "ipa_mem.h" #include "ipa_table.h" -#include "ipa_modem.h" #include "ipa_smp2p.h" +#include "ipa_modem.h" #include "ipa_uc.h" #include "ipa_interrupt.h" #include "gsi_trans.h" @@ -802,6 +802,11 @@ static int ipa_remove(struct platform_device *pdev) struct device *dev = &pdev->dev; int ret; + /* Prevent the modem from triggering a call to ipa_setup(). This + * also ensures a modem-initiated setup that's underway completes. + */ + ipa_smp2p_irq_disable_setup(ipa); + ret = pm_runtime_get_sync(dev); if (WARN_ON(ret < 0)) goto out_power_put; |