Merge "msm: kgsl: Correct the state transitions in suspend function"

This commit is contained in:
Linux Build Service Account 2018-11-09 06:19:13 -08:00 committed by Gerrit - the friendly Code Review server
commit ac7b931cf8

View file

@ -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;