diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-24 20:32:13 +0300 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2016-01-25 16:23:51 +0300 |
| commit | f6427760a29ba3fd968e27ea567b1ebdd500740b (patch) | |
| tree | 14c4ffd49d5a276ab2507f1849d3a1c6cbce7d26 /drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |
| parent | 339073ef77e45e87ec4cc8671b2d2328dcfd31f0 (diff) | |
| download | linux-f6427760a29ba3fd968e27ea567b1ebdd500740b.tar.xz | |
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>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 056a72e6ed26..e0e68dd7565d 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); |