Skip to content

Commit

Permalink
Merge tag 'drm-misc-next-fixes-2021-06-24' of git://anongit.freedeskt…
Browse files Browse the repository at this point in the history
…op.org/drm/drm-misc into drm-next

Short summary of fixes pull:

 * amdgpu: Fix test for allocation failures

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YNQxVybBGdjLMUQJ@linux-uq9g
  • Loading branch information
Dave Airlie committed Jun 30, 2021
2 parents b322a50 + eed75ce commit 4bac159
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);

*res = kzalloc(sizeof(**res), GFP_KERNEL);
if (*res)
if (!*res)
return -ENOMEM;

ttm_resource_init(tbo, place, *res);
Expand Down

0 comments on commit 4bac159

Please sign in to comment.