summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-04-09 09:28:55 +1000
committerDave Airlie <airlied@redhat.com>2013-04-09 09:28:55 +1000
commitc9cdee17653409dedeb65c0733a253f6fe3fc7d6 (patch)
treee41b1a684421cf52a2db271ab3c34a4fe9ff7bbe /drivers/gpu
parentf011a08c804d50eeff4abf2d308cdce492f015aa (diff)
parentb1ea3e6e3883c5191caa5be72b3a5b9c32812e38 (diff)
downloadlinux-c9cdee17653409dedeb65c0733a253f6fe3fc7d6.tar.bz2
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
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 7f0e6c3f37d1..1ddc03e51bf4 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -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;