diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:49:04 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:51:11 -0700 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/pci/mixart | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
| download | linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.bz2 linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'sound/pci/mixart')
| -rw-r--r-- | sound/pci/mixart/mixart_hwdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c index 122c28efc483..f98603146132 100644 --- a/sound/pci/mixart/mixart_hwdep.c +++ b/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; } |