From 8832a9d2aaf878b1985390dcfb5f54d745f29a30 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 8 Jul 2008 17:36:45 +0100
Subject: [PATCH] --- yaml --- r: 100968 b: refs/heads/master c:
 b561c74ae2832d32cc189ecd82863d31151cdcb5 h: refs/heads/master 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 22d38b6c5bab..a653dfe66eb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed5a2825feb79c424882c9d0f483172a91c93b54
+refs/heads/master: b561c74ae2832d32cc189ecd82863d31151cdcb5
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;
 	}