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

Merge "soc: qcom: glink_spi_xprt: Fix the suspend and resume sequence"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-18 12:04:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit dbf87d1e56
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/soc/qcom/glink_spi_xprt.c
View file

@ -210,11 +210,12 @@ static uint32_t negotiate_features_v1(struct glink_transport_if *if_ptr,
*/ */
static int wdsp_suspend(struct glink_cmpnt *cmpnt) static int wdsp_suspend(struct glink_cmpnt *cmpnt)
{ {
int rc = 0;
if (cmpnt && cmpnt->master_dev && if (cmpnt && cmpnt->master_dev &&
cmpnt->master_ops && cmpnt->master_ops->suspend) cmpnt->master_ops && cmpnt->master_ops->suspend)
return cmpnt->master_ops->suspend(cmpnt->master_dev); rc = cmpnt->master_ops->suspend(cmpnt->master_dev);
else return rc;
return -EINVAL;
} }
/** /**
@ -225,11 +226,12 @@ static int wdsp_suspend(struct glink_cmpnt *cmpnt)
*/ */
static int wdsp_resume(struct glink_cmpnt *cmpnt) static int wdsp_resume(struct glink_cmpnt *cmpnt)
{ {
int rc = 0;
if (cmpnt && cmpnt->master_dev && if (cmpnt && cmpnt->master_dev &&
cmpnt->master_ops && cmpnt->master_ops->resume) cmpnt->master_ops && cmpnt->master_ops->resume)
return cmpnt->master_ops->resume(cmpnt->master_dev); rc = cmpnt->master_ops->resume(cmpnt->master_dev);
else return rc;
return -EINVAL;
} }
/** /**