From 62cd2fb6151e04f57462b21a459f499de04eeddd Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 8 Jul 2008 17:30:30 +0100
Subject: [PATCH] --- yaml --- r: 99175 b: refs/heads/master c:
 bd5d06eb8f0b9e0eb117b9c45c254d577ec2e273 h: refs/heads/master i:   99173:
 61d8bea3809c5c9eef1ace78198b051cd59117f0   99171:
 fd9858aa6da91dd7cdc895158bf04f9660316a5a   99167:
 e469d894c0e4c7f039a3c60c0c0eeb19afbb38a7 v: v3

---
 [refs]                            | 2 +-
 trunk/sound/drivers/vx/vx_hwdep.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e93b85bc00aa..71530bd573fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f48413dd0f28d81a20fba2e264dd1b9f205893e
+refs/heads/master: bd5d06eb8f0b9e0eb117b9c45c254d577ec2e273
diff --git a/trunk/sound/drivers/vx/vx_hwdep.c b/trunk/sound/drivers/vx/vx_hwdep.c
index 1dfe6948e6ff..efd22e92bced 100644
--- a/trunk/sound/drivers/vx/vx_hwdep.c
+++ b/trunk/sound/drivers/vx/vx_hwdep.c
@@ -183,7 +183,7 @@ static int vx_hwdep_dsp_load(struct snd_hwdep *hw,
 		kfree(fw);
 		return -ENOMEM;
 	}
-	if (copy_from_user(fw->data, dsp->image, dsp->length)) {
+	if (copy_from_user((void *)fw->data, dsp->image, dsp->length)) {
 		free_fw(fw);
 		return -EFAULT;
 	}