diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/msnd.c | 2 | ||||
-rw-r--r-- | sound/pci/aw2/aw2-saa7146.c | 2 | ||||
-rw-r--r-- | sound/pci/sis7019.h | 4 | ||||
-rw-r--r-- | sound/pci/vx222/vx222_ops.c | 2 | ||||
-rw-r--r-- | sound/usb/usbmixer.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c index e4282d93a1aa..21eb6dce46df 100644 --- a/sound/oss/msnd.c +++ b/sound/oss/msnd.c | |||
@@ -100,7 +100,7 @@ void msnd_fifo_free(msnd_fifo *f) | |||
100 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) | 100 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) |
101 | { | 101 | { |
102 | msnd_fifo_free(f); | 102 | msnd_fifo_free(f); |
103 | f->data = (char *)vmalloc(n); | 103 | f->data = vmalloc(n); |
104 | f->n = n; | 104 | f->n = n; |
105 | f->tail = 0; | 105 | f->tail = 0; |
106 | f->head = 0; | 106 | f->head = 0; |
diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c index 6a3891ab69dd..296123ab74f7 100644 --- a/sound/pci/aw2/aw2-saa7146.c +++ b/sound/pci/aw2/aw2-saa7146.c | |||
@@ -108,7 +108,7 @@ void snd_aw2_saa7146_setup(struct snd_aw2_saa7146 *chip, | |||
108 | #endif | 108 | #endif |
109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ | 109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ |
110 | 110 | ||
111 | /* At initialization WS1 and WS2 are disbaled (configured as input */ | 111 | /* At initialization WS1 and WS2 are disabled (configured as input) */ |
112 | acon1 |= 0 * WS1_CTRL; | 112 | acon1 |= 0 * WS1_CTRL; |
113 | acon1 |= 0 * WS2_CTRL; | 113 | acon1 |= 0 * WS2_CTRL; |
114 | 114 | ||
diff --git a/sound/pci/sis7019.h b/sound/pci/sis7019.h index 013b6739a742..bc8c76819408 100644 --- a/sound/pci/sis7019.h +++ b/sound/pci/sis7019.h | |||
@@ -203,7 +203,7 @@ | |||
203 | #define SIS_WEISR_B 0xac | 203 | #define SIS_WEISR_B 0xac |
204 | 204 | ||
205 | 205 | ||
206 | /* Playback DMA parameters (paramter RAM) */ | 206 | /* Playback DMA parameters (parameter RAM) */ |
207 | #define SIS_PLAY_DMA_OFFSET 0x0000 | 207 | #define SIS_PLAY_DMA_OFFSET 0x0000 |
208 | #define SIS_PLAY_DMA_SIZE 0x10 | 208 | #define SIS_PLAY_DMA_SIZE 0x10 |
209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ | 209 | #define SIS_PLAY_DMA_ADDR(addr, num) \ |
@@ -228,7 +228,7 @@ | |||
228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 | 228 | #define SIS_PLAY_DMA_SSO_MASK 0xffff0000 |
229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff | 229 | #define SIS_PLAY_DMA_ESO_MASK 0x0000ffff |
230 | 230 | ||
231 | /* Capture DMA parameters (paramter RAM) */ | 231 | /* Capture DMA parameters (parameter RAM) */ |
232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 | 232 | #define SIS_CAPTURE_DMA_OFFSET 0x0800 |
233 | #define SIS_CAPTURE_DMA_SIZE 0x10 | 233 | #define SIS_CAPTURE_DMA_SIZE 0x10 |
234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ | 234 | #define SIS_CAPTURE_DMA_ADDR(addr, num) \ |
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index c0efe4491116..6416d3f0c7be 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
@@ -367,7 +367,7 @@ static int vx2_load_xilinx_binary(struct vx_core *chip, const struct firmware *x | |||
367 | unsigned int port; | 367 | unsigned int port; |
368 | const unsigned char *image; | 368 | const unsigned char *image; |
369 | 369 | ||
370 | /* XILINX reset (wait at least 1 milisecond between reset on and off). */ | 370 | /* XILINX reset (wait at least 1 millisecond between reset on and off). */ |
371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); | 371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); |
372 | vx_inl(chip, CNTRL); | 372 | vx_inl(chip, CNTRL); |
373 | msleep(10); | 373 | msleep(10); |
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index ecb58e7a6245..4bd3a7a0edc1 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -423,7 +423,7 @@ static int set_ctl_value(struct usb_mixer_elem_info *cval, int request, int vali | |||
423 | value_set = convert_bytes_value(cval, value_set); | 423 | value_set = convert_bytes_value(cval, value_set); |
424 | buf[0] = value_set & 0xff; | 424 | buf[0] = value_set & 0xff; |
425 | buf[1] = (value_set >> 8) & 0xff; | 425 | buf[1] = (value_set >> 8) & 0xff; |
426 | while (timeout -- > 0) | 426 | while (timeout-- > 0) |
427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, | 427 | if (snd_usb_ctl_msg(cval->mixer->chip->dev, |
428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), | 428 | usb_sndctrlpipe(cval->mixer->chip->dev, 0), |
429 | request, | 429 | request, |