aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-11-08 13:15:43 +0100
committerThierry Reding <treding@nvidia.com>2013-12-03 10:04:42 +0100
commita7ed68fcc73fd91acc0502b88e44a69f78864d89 (patch)
treea6859d5b5718f76e897100f67862164a43763b63
parent7602fa1d29f5c4e92d6a36e79000a0f55c317a32 (diff)
downloadmfd-fixes-a7ed68fcc73fd91acc0502b88e44a69f78864d89.tar.gz
drm/tegra: Fix address space mismatches
sparse complains because __user annotations aren't placed consistently. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/drm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 28e1781377180..56b29c3cdf2f4 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -135,11 +135,11 @@ int tegra_drm_submit(struct tegra_drm_context *context,
unsigned int num_relocs = args->num_relocs;
unsigned int num_waitchks = args->num_waitchks;
struct drm_tegra_cmdbuf __user *cmdbufs =
- (void * __user)(uintptr_t)args->cmdbufs;
+ (void __user *)(uintptr_t)args->cmdbufs;
struct drm_tegra_reloc __user *relocs =
- (void * __user)(uintptr_t)args->relocs;
+ (void __user *)(uintptr_t)args->relocs;
struct drm_tegra_waitchk __user *waitchks =
- (void * __user)(uintptr_t)args->waitchks;
+ (void __user *)(uintptr_t)args->waitchks;
struct drm_tegra_syncpt syncpt;
struct host1x_job *job;
int err;
@@ -204,7 +204,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
if (err)
goto fail;
- err = copy_from_user(&syncpt, (void * __user)(uintptr_t)args->syncpts,
+ err = copy_from_user(&syncpt, (void __user *)(uintptr_t)args->syncpts,
sizeof(syncpt));
if (err)
goto fail;