evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: Shutdown only if probed"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-02 13:52:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0e34d5ec1c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/soc/qcom/icnss.c
View file

@ -208,9 +208,7 @@ enum icnss_debug_quirks {
PDR_ONLY,
};
#define ICNSS_QUIRKS_DEFAULT ( \
BIT(SSR_ONLY) \
)
#define ICNSS_QUIRKS_DEFAULT 0
unsigned long quirks = ICNSS_QUIRKS_DEFAULT;
module_param(quirks, ulong, 0600);
@ -1911,6 +1909,9 @@ static int icnss_call_driver_reinit(struct icnss_priv *priv)
if (!priv->ops || !priv->ops->reinit)
goto out;
if (!test_bit(ICNSS_DRIVER_PROBED, &penv->state))
goto out;
icnss_hw_power_on(priv);
ret = priv->ops->reinit(&priv->pdev->dev);
@ -2048,6 +2049,9 @@ static int icnss_qmi_pd_event_service_down(struct icnss_priv *priv, void *data)
if (!priv->ops || !priv->ops->shutdown)
goto out;
if (!test_bit(ICNSS_DRIVER_PROBED, &penv->state))
goto out;
priv->ops->shutdown(&priv->pdev->dev);
out: