Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / nouveau / nv04_dac.c

diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index ba6423f2ffccb2e5e7f2a8c9ea431c4aa087cec2..e000455e06d0154000b97d6883614afa8ff5aa98 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -74,14 +74,14 @@ static int sample_load_twice(struct drm_device *dev, bool sense[2])
                 * use a 10ms timeout (guards against crtc being inactive, in
                 * which case blank state would never change)
                 */
-               if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR,
-                                       0x00000001, 0x00000000))
+               if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR,
+                                    0x00000001, 0x00000000))
                        return -EBUSY;
-               if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR,
-                                       0x00000001, 0x00000001))
+               if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR,
+                                    0x00000001, 0x00000001))
                        return -EBUSY;
-               if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR,
-                                       0x00000001, 0x00000000))
+               if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR,
+                                    0x00000001, 0x00000000))
                        return -EBUSY;
 
                udelay(100);