summaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-07-14 15:49:04 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-14 15:51:11 -0700
commit751851af7aae9b8bd5a60b3897209081fbc18b2b (patch)
tree5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/drivers
parenta41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff)
parentd71792ac3d48df6693f7b339e02494efc27036c3 (diff)
downloadlwn-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz
lwn-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/drivers')
-rw-r--r--sound/drivers/vx/vx_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index 99538862e342..585af2eb1438 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -453,7 +453,7 @@ int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *boot)
vx_outb(chip, TXM, 0);
vx_outb(chip, TXL, 0);
} else {
- unsigned char *image = boot->data + i;
+ const unsigned char *image = boot->data + i;
if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) {
snd_printk(KERN_ERR "dsp boot failed at %d\n", i);
return -EIO;
@@ -671,7 +671,7 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)
unsigned int i;
int err;
unsigned int csum = 0;
- unsigned char *image, *cptr;
+ const unsigned char *image, *cptr;
snd_assert(dsp->size % 3 == 0, return -EINVAL);