Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm Fix another *@!#^$@!& timeout...



details:   https://anonhg.NetBSD.org/src/rev/6bca0d8d1215
branches:  trunk
changeset: 336390:6bca0d8d1215
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 28 03:03:30 2015 +0000

description:
Fix another *@!#^$@!& timeout return convention mistake.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_irq.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (20 lines):

diff -r 9585aab4e942 -r 6bca0d8d1215 sys/external/bsd/drm2/dist/drm/drm_irq.c
--- a/sys/external/bsd/drm2/dist/drm/drm_irq.c  Fri Feb 27 21:34:40 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_irq.c  Sat Feb 28 03:03:30 2015 +0000
@@ -1301,11 +1301,11 @@
                    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



Home | Main Index | Thread Index | Old Index