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/pcxhr | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'sound/pci/pcxhr')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr_core.c | 4 | ||||
| -rw-r--r-- | sound/pci/pcxhr/pcxhr_hwdep.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index abe5c59b72d..000e6fed6e3 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c @@ -269,7 +269,7 @@ int pcxhr_load_xilinx_binary(struct pcxhr_mgr *mgr, const struct firmware *xilin unsigned int chipsc; unsigned char data; unsigned char mask; - unsigned char *image; + const unsigned char *image; /* test first xilinx */ chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); @@ -316,7 +316,7 @@ static int pcxhr_download_dsp(struct pcxhr_mgr *mgr, const struct firmware *dsp) int err; unsigned int i; unsigned int len; - unsigned char *data; + const unsigned char *data; unsigned char dummy; /* check the length of boot image */ snd_assert(dsp->size > 0, return -EINVAL); diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index e6a4bfbb91b..d2f043278cf 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/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; } |