diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 12:04:35 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 12:04:35 -0700 |
commit | dbf87d1e56e6ca95b2bb09678cfe494607876e55 (patch) | |
tree | 20d09f206639201210d0a8e1b5c25aa07ede8b72 /drivers | |
parent | 645df5014c80a596517871e406c6e1dc44a8e20e (diff) | |
parent | ea637de7e471365aa7f4e0eed3816d203fa04dbd (diff) |
Merge "soc: qcom: glink_spi_xprt: Fix the suspend and resume sequence"
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/soc/qcom/glink_spi_xprt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/soc/qcom/glink_spi_xprt.c b/drivers/soc/qcom/glink_spi_xprt.c index 6c91ac54821d..66caa6ecaad2 100644 --- a/drivers/soc/qcom/glink_spi_xprt.c +++ b/drivers/soc/qcom/glink_spi_xprt.c @@ -210,11 +210,12 @@ static uint32_t negotiate_features_v1(struct glink_transport_if *if_ptr, */ static int wdsp_suspend(struct glink_cmpnt *cmpnt) { + int rc = 0; + if (cmpnt && cmpnt->master_dev && cmpnt->master_ops && cmpnt->master_ops->suspend) - return cmpnt->master_ops->suspend(cmpnt->master_dev); - else - return -EINVAL; + rc = cmpnt->master_ops->suspend(cmpnt->master_dev); + return rc; } /** @@ -225,11 +226,12 @@ static int wdsp_suspend(struct glink_cmpnt *cmpnt) */ static int wdsp_resume(struct glink_cmpnt *cmpnt) { + int rc = 0; + if (cmpnt && cmpnt->master_dev && cmpnt->master_ops && cmpnt->master_ops->resume) - return cmpnt->master_ops->resume(cmpnt->master_dev); - else - return -EINVAL; + rc = cmpnt->master_ops->resume(cmpnt->master_dev); + return rc; } /** |