mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-25 16:21:32 +00:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From f6427760a29ba3fd968e27ea567b1ebdd500740b Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Sun, 24 Jan 2016 17:32:13 +0000
|
|
Subject: [PATCH] drm/etnaviv: fix failure path if model is zero
|
|
|
|
Fix the failure path to call pm_runtime_mark_last_busy() when failing
|
|
due to the model field being zero.
|
|
|
|
Acked-by: Christian Gmeiner <christian.gmeiner@gmail.com>
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
|
|
---
|
|
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
|
|
index 056a72e..e0e68dd 100644
|
|
--- 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);
|
|
--
|
|
2.7.0.rc3
|
|
|