diff options
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 abe5c59b72df..000e6fed6e39 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 | |||
269 | unsigned int chipsc; | 269 | unsigned int chipsc; |
270 | unsigned char data; | 270 | unsigned char data; |
271 | unsigned char mask; | 271 | unsigned char mask; |
272 | unsigned char *image; | 272 | const unsigned char *image; |
273 | 273 | ||
274 | /* test first xilinx */ | 274 | /* test first xilinx */ |
275 | chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); | 275 | chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); |
@@ -316,7 +316,7 @@ static int pcxhr_download_dsp(struct pcxhr_mgr *mgr, const struct firmware *dsp) | |||
316 | int err; | 316 | int err; |
317 | unsigned int i; | 317 | unsigned int i; |
318 | unsigned int len; | 318 | unsigned int len; |
319 | unsigned char *data; | 319 | const unsigned char *data; |
320 | unsigned char dummy; | 320 | unsigned char dummy; |
321 | /* check the length of boot image */ | 321 | /* check the length of boot image */ |
322 | snd_assert(dsp->size > 0, return -EINVAL); | 322 | snd_assert(dsp->size > 0, return -EINVAL); |
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index e6a4bfbb91bb..d2f043278cf4 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, | |||
394 | (unsigned long)fw.size); | 394 | (unsigned long)fw.size); |
395 | return -ENOMEM; | 395 | return -ENOMEM; |
396 | } | 396 | } |
397 | if (copy_from_user(fw.data, dsp->image, dsp->length)) { | 397 | if (copy_from_user((void *)fw.data, dsp->image, dsp->length)) { |
398 | vfree(fw.data); | 398 | vfree(fw.data); |
399 | return -EFAULT; | 399 | return -EFAULT; |
400 | } | 400 | } |