diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-21 16:56:52 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-21 16:56:52 +0400 |
| commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
| tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |
| parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
| parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) | |
| download | linux-16ec790938d4f356c82fab27b9a9adf4d6fe19a6.tar.xz | |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_resource.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 0e67cf41065d..37fb4befec82 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -970,7 +970,7 @@ void vmw_resource_unreserve(struct vmw_resource *res, if (new_backup) res->backup_offset = new_backup_offset; - if (!res->func->may_evict) + if (!res->func->may_evict || res->id == -1) return; write_lock(&dev_priv->resource_lock); |