diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-04-09 01:28:55 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-04-09 01:28:55 +0200 |
| commit | c9cdee17653409dedeb65c0733a253f6fe3fc7d6 (patch) | |
| tree | e41b1a684421cf52a2db271ab3c34a4fe9ff7bbe /drivers/gpu | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ne... (diff) | |
| parent | drm/nouveau: fix unconditional return waiting on memory (diff) | |
| download | linux-c9cdee17653409dedeb65c0733a253f6fe3fc7d6.tar.xz linux-c9cdee17653409dedeb65c0733a253f6fe3fc7d6.zip | |
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.c | 2 |
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; |