From a1703199a884a5eeb0a0f8396c132a23f62f88bf Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 8 Jul 2008 17:45:58 +0100 Subject: [PATCH] --- yaml --- r: 100971 b: refs/heads/master c: 67852dc08c0782735d48ce1e2a6eb44cd02a6ff7 h: refs/heads/master i: 100969: 7a5d12111de6ff3ffc77e53378d05132dccf1115 100967: 5b79999ba018049a80a29cd9ed7844c915968dd0 v: v3 --- [refs] | 2 +- trunk/sound/pci/pcxhr/pcxhr_hwdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6eb08985dc5..a0ecbd1e61a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b8a3e4cb1361cf4b4a50916876e72f07a9037e9 +refs/heads/master: 67852dc08c0782735d48ce1e2a6eb44cd02a6ff7 diff --git a/trunk/sound/pci/pcxhr/pcxhr_hwdep.c b/trunk/sound/pci/pcxhr/pcxhr_hwdep.c index e6a4bfbb91bb..d2f043278cf4 100644 --- a/trunk/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/trunk/sound/pci/pcxhr/pcxhr_hwdep.c @@ -394,7 +394,7 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw, (unsigned long)fw.size); 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; }