Module Name: src
Committed By: riastradh
Date: Sat Feb 28 03:03:30 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_irq.c
Log Message:
Fix another *@!#^$@!& timeout return convention mistake.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_irq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.5 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_irq.c Sat Feb 28 03:03:30 2015
@@ -1301,11 +1301,11 @@ int drm_wait_vblank(struct drm_device *d
vblwait->request.sequence) <= (1 << 23)) ||
!dev->irq_enabled));
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
- if (0 < ret)
- /*
- * ret is ticks remaining on success in this case, but
- * caller just wants 0 for success.
- */
+ if (ret < 0) /* Failed: do nothing. */
+ ;
+ else if (ret == 0) /* Timed out: return -EBUSY like Linux. */
+ ret = -EBUSY;
+ else /* Succeeded (ret > 0): return 0. */
ret = 0;
}
#else
