diff options
| author |   Roel Kluin <roel.kluin@gmail.com> | 2009-06-10 12:43:48 -0700 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2009-06-11 16:10:27 +1000 |
| commit | dcae3626d031fe6296b1e96a16f986193a41f840 (patch) | |
| tree | 0c9040b8569f47afaaf409d83d720889ba2d25f1 /include/drm | |
| parent | drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect) (diff) | |
| download | linux-dev-dcae3626d031fe6296b1e96a16f986193a41f840.tar.xz linux-dev-dcae3626d031fe6296b1e96a16f986193a41f840.zip | |
drm: fix LOCK_TEST_WITH_RETURN macro
When this macro isn't called with 'file_priv' this will result in a build
failure.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index b84d8ae35e6f..efa5f79a35c7 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -237,15 +237,15 @@ struct drm_device; * \param dev DRM device. * \param filp file pointer of the caller. */ -#define LOCK_TEST_WITH_RETURN( dev, file_priv ) \ -do { \ - if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) || \ - file_priv->master->lock.file_priv != file_priv) { \ +#define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \ +do { \ + if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \ + _file_priv->master->lock.file_priv != _file_priv) { \ DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ - __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\ - file_priv->master->lock.file_priv, file_priv); \ - return -EINVAL; \ - } \ + __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\ + _file_priv->master->lock.file_priv, _file_priv); \ + return -EINVAL; \ + } \ } while (0) /** |