Commit c9cdee17 authored by Dave Airlie's avatar Dave Airlie

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
...@@ -479,7 +479,7 @@ nv50_display_flip_wait(void *data) ...@@ -479,7 +479,7 @@ nv50_display_flip_wait(void *data)
{ {
struct nv50_display_flip *flip = data; struct nv50_display_flip *flip = data;
if (nouveau_bo_rd32(flip->disp->sync, flip->chan->addr / 4) == if (nouveau_bo_rd32(flip->disp->sync, flip->chan->addr / 4) ==
flip->chan->data); flip->chan->data)
return true; return true;
usleep_range(1, 2); usleep_range(1, 2);
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment