diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-09 06:19:13 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-09 06:19:12 -0800 |
| commit | ac7b931cf83132d1b02a4db626b8acd2e9ea41f0 (patch) | |
| tree | 3d2c1d4169eac0d8017edd243f8d93662f6a4ffb | |
| parent | 06ff6ccf780f632b28b94614d8cbb961d9af9ce3 (diff) | |
| parent | 3e3bb6e7bbd525f040af649af355102a6834b3b7 (diff) | |
Merge "msm: kgsl: Correct the state transitions in suspend function"
| -rw-r--r-- | drivers/gpu/msm/kgsl_pwrctrl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c index b5476b06176a..b1b0b69d55ba 100644 --- a/drivers/gpu/msm/kgsl_pwrctrl.c +++ b/drivers/gpu/msm/kgsl_pwrctrl.c @@ -2785,7 +2785,7 @@ static int _suspend(struct kgsl_device *device) if ((device->state == KGSL_STATE_NONE) || (device->state == KGSL_STATE_INIT) || (device->state == KGSL_STATE_SUSPEND)) - goto done; + return ret; /* drain to prevent from more commands being submitted */ device->ftbl->drain(device); @@ -2802,7 +2802,6 @@ static int _suspend(struct kgsl_device *device) if (ret) goto err; -done: kgsl_pwrctrl_set_state(device, KGSL_STATE_SUSPEND); return ret; |