Skip to content

Commit

Permalink
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Browse files Browse the repository at this point in the history
Pull drm fix from Dave Airlie:
 "An oops snuck in in an -rc3 patch, this fixes it"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  [PATCH] drm/mm: Fix support 4 GiB and larger ranges
  • Loading branch information
torvalds committed Mar 15, 2015
2 parents 1ee89c5 + 046d669 commit 0835208
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static int check_free_hole(u64 start, u64 end, u64 size, unsigned alignment)
unsigned rem;

rem = do_div(tmp, alignment);
if (tmp)
if (rem)
start += alignment - rem;
}

Expand Down

0 comments on commit 0835208

Please sign in to comment.