diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-04-01 20:38:05 +1030 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-04-01 20:38:09 +1030 |
| commit | 1fd5e60554e7194f8adc526e985714b9fc25c78d (patch) | |
| tree | 1cc6b5d9cae4b5b99770009eabeb15ea0059ef0a /drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | |
| parent | c8733f5abd0656acfef17d462e72ef105db9924d (diff) | |
| parent | 1f6f316a537d4310747b08f89fb32565317b288b (diff) | |
| download | blackbird-obmc-linux-1fd5e60554e7194f8adc526e985714b9fc25c78d.tar.gz blackbird-obmc-linux-1fd5e60554e7194f8adc526e985714b9fc25c78d.zip | |
Merge tag 'v5.0.5' into dev-5.0
This is the 5.0.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index b93c558dd86e..7da752ca1c34 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c @@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man, id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL); if (id < 0) - return id; + return (id != -ENOMEM ? 0 : id); spin_lock(&gman->lock); |
