diff options
-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; | |||
237 | * \param dev DRM device. | 237 | * \param dev DRM device. |
238 | * \param filp file pointer of the caller. | 238 | * \param filp file pointer of the caller. |
239 | */ | 239 | */ |
240 | #define LOCK_TEST_WITH_RETURN( dev, file_priv ) \ | 240 | #define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \ |
241 | do { \ | 241 | do { \ |
242 | if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) || \ | 242 | if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \ |
243 | file_priv->master->lock.file_priv != file_priv) { \ | 243 | _file_priv->master->lock.file_priv != _file_priv) { \ |
244 | DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ | 244 | DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ |
245 | __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\ | 245 | __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\ |
246 | file_priv->master->lock.file_priv, file_priv); \ | 246 | _file_priv->master->lock.file_priv, _file_priv); \ |
247 | return -EINVAL; \ | 247 | return -EINVAL; \ |
248 | } \ | 248 | } \ |
249 | } while (0) | 249 | } while (0) |
250 | 250 | ||
251 | /** | 251 | /** |