diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-19 18:47:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-19 18:47:57 -0700 |
| commit | 88451207ce3637ba11ce8a6cf1186620ed5ba2ea (patch) | |
| tree | 0cdf07fba482d301d51a52a06494c73eab45000c /drivers | |
| parent | c9176f0451014099f39821f2635b78e61c9096a5 (diff) | |
| parent | 8ce0856ed37de3f9bd3f12ffc3ff484b40eacb82 (diff) | |
Merge "msm: vidc: check for venus_hfi_device state in resume"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/vidc/venus_hfi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c index df4c99b50cd1..ac53b3bcb4ed 100644 --- a/drivers/media/platform/msm/vidc/venus_hfi.c +++ b/drivers/media/platform/msm/vidc/venus_hfi.c @@ -4249,6 +4249,9 @@ static inline int __resume(struct venus_hfi_device *device) } else if (device->power_enabled) { dprintk(VIDC_DBG, "Power is already enabled\n"); goto exit; + } else if (!__core_in_valid_state(device)) { + dprintk(VIDC_DBG, "venus_hfi_device in deinit state."); + return -EINVAL; } dprintk(VIDC_DBG, "Resuming from power collapse\n"); |