diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
| commit | dcd6dfcfe959bade75fbf49499775985d2cac5d5 (patch) | |
| tree | 45e37b24d7e34a1bdefe04e65633168873476ca7 /drivers/gpu/drm/nouveau/nouveau_fence.c | |
| parent | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (diff) | |
| parent | d785d78bbdb53580b12c40e820af5a3281ce2fc8 (diff) | |
| download | talos-op-linux-dcd6dfcfe959bade75fbf49499775985d2cac5d5.tar.gz talos-op-linux-dcd6dfcfe959bade75fbf49499775985d2cac5d5.zip | |
Merge branch 'drm-linus' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 0cff7eb3690a..dacac9a0842a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -205,7 +205,7 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) schedule_timeout(1); if (intr && signal_pending(current)) { - ret = -ERESTART; + ret = -ERESTARTSYS; break; } } |
