Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9cdee17 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-fixes-3.9' of... 

Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

too many semicolons.

* 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix unconditional return waiting on memory
parents f011a08c b1ea3e6e

drivers/gpu/drm/nouveau/nv50_display.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ nv50_display_flip_wait(void *data) 
{

	struct nv50_display_flip *flip = data;

	if (nouveau_bo_rd32(flip->disp->sync, flip->chan->addr / 4) ==

					      flip->chan->data);

					      flip->chan->data)

		return true;

	usleep_range(1, 2);

	return false;