From 14c1f4cc3eea39b4140a9fbe3ac017facba5a9ec Mon Sep 17 00:00:00 2001 From: Darren Jenkins Date: Wed, 30 Dec 2009 12:16:35 +1100 Subject: [PATCH] --- yaml --- r: 178871 b: refs/heads/master c: 65aa2f4e8d85b6145ef4834f440a63ab68bd7443 h: refs/heads/master i: 178869: e72640e8e9991ebf24032601edb5c49a81e2050d 178867: a722006fd0411263079e56c9b02ca155809aa790 178863: d52acc3f123479b7f78f1050dcb59a9a617eb6ab v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_irq.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2bb51ade1f42..2726f3a32f6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 875c186620e017e62b773c93e46af21bb704fe6b +refs/heads/master: 65aa2f4e8d85b6145ef4834f440a63ab68bd7443 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_irq.c b/trunk/drivers/gpu/drm/radeon/radeon_irq.c index b79ecc4a7cc4..2f349a300195 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_irq.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_irq.c @@ -289,16 +289,16 @@ int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_pr drm_radeon_irq_emit_t *emit = data; int result; - if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) - return -EINVAL; - - LOCK_TEST_WITH_RETURN(dev, file_priv); - if (!dev_priv) { DRM_ERROR("called with no initialization\n"); return -EINVAL; } + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) + return -EINVAL; + + LOCK_TEST_WITH_RETURN(dev, file_priv); + result = radeon_emit_irq(dev); if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {