diff --git a/[refs] b/[refs]
index a0ecbd1e61a8..461becaf019d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67852dc08c0782735d48ce1e2a6eb44cd02a6ff7
+refs/heads/master: fd4f80de4612cc5255c108a8c13df88f89c46654
diff --git a/trunk/sound/pci/mixart/mixart_hwdep.c b/trunk/sound/pci/mixart/mixart_hwdep.c
index 122c28efc483..f98603146132 100644
--- a/trunk/sound/pci/mixart/mixart_hwdep.c
+++ b/trunk/sound/pci/mixart/mixart_hwdep.c
@@ -613,7 +613,7 @@ static int mixart_hwdep_dsp_load(struct snd_hwdep *hw,
 			   (int)dsp->length);
 		return -ENOMEM;
 	}
-	if (copy_from_user(fw.data, dsp->image, dsp->length)) {
+	if (copy_from_user((void *) fw.data, dsp->image, dsp->length)) {
 		vfree(fw.data);
 		return -EFAULT;
 	}