iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: fix LOCK_TEST_WITH_RETURN macro

Browse Source 
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>
This commit is contained in:
Roel Kluin 2009-06-10 12:43:48 -07:00 committed by Dave Airlie
parent 03d6069912
commit dcae3626d0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/drm/drmP.h
View File

@ -237,15 +237,15 @@ struct drm_device;
* \param dev DRM device. * \param dev DRM device.
* \param filp file pointer of the caller. * \param filp file pointer of the caller.
*/ */
#define LOCK_TEST_WITH_RETURN( dev, file_priv ) \ #define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \
do { \ do { \
if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) || \ if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \
file_priv->master->lock.file_priv != file_priv) { \ _file_priv->master->lock.file_priv != _file_priv) { \
DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ 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),\ __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\
file_priv->master->lock.file_priv, file_priv); \ _file_priv->master->lock.file_priv, _file_priv); \
return -EINVAL; \ return -EINVAL; \
} \ } \
} while (0) } while (0)
/** /**