projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
339073e
)
drm/etnaviv: fix failure path if model is zero
author
Russell King
<
[email protected]
>
Sun, 24 Jan 2016 17:32:13 +0000
(17:32 +0000)
committer
Lucas Stach
<
[email protected]
>
Mon, 25 Jan 2016 13:23:51 +0000
(14:23 +0100)
Fix the failure path to call pm_runtime_mark_last_busy() when failing
due to the model field being zero.
Acked-by: Christian Gmeiner <
[email protected]
>
Signed-off-by: Russell King <
[email protected]
>
Signed-off-by: Lucas Stach <
[email protected]
>
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 056a72e6ed26273146269ee0258784e8a714d36a..e0e68dd7565d04804e3536ea05b53ec6b33c1d46 100644
(file)
--- a/
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@
-511,8
+511,8
@@
int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
if (gpu->identity.model == 0) {
dev_err(gpu->dev, "Unknown GPU model\n");
-
pm_runtime_put_autosuspend(gpu->dev)
;
-
return -ENXIO
;
+
ret = -ENXIO
;
+
goto fail
;
}
ret = etnaviv_hw_reset(gpu);