diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/drivers | |
| 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/drivers')
| -rw-r--r-- | sound/drivers/vx/vx_core.c | 4 |
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) | |||
| 453 | vx_outb(chip, TXM, 0); | 453 | vx_outb(chip, TXM, 0); |
| 454 | vx_outb(chip, TXL, 0); | 454 | vx_outb(chip, TXL, 0); |
| 455 | } else { | 455 | } else { |
| 456 | unsigned char *image = boot->data + i; | 456 | const unsigned char *image = boot->data + i; |
| 457 | if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) { | 457 | if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) { |
| 458 | snd_printk(KERN_ERR "dsp boot failed at %d\n", i); | 458 | snd_printk(KERN_ERR "dsp boot failed at %d\n", i); |
| 459 | return -EIO; | 459 | return -EIO; |
| @@ -671,7 +671,7 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp) | |||
| 671 | unsigned int i; | 671 | unsigned int i; |
| 672 | int err; | 672 | int err; |
| 673 | unsigned int csum = 0; | 673 | unsigned int csum = 0; |
| 674 | unsigned char *image, *cptr; | 674 | const unsigned char *image, *cptr; |
| 675 | 675 | ||
| 676 | snd_assert(dsp->size % 3 == 0, return -EINVAL); | 676 | snd_assert(dsp->size % 3 == 0, return -EINVAL); |
| 677 | 677 | ||