diff options
Diffstat (limited to 'sound/usb/usbaudio.c')
| -rw-r--r-- | sound/usb/usbaudio.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index bfbec5876659..d5ae2055b896 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
| @@ -1439,9 +1439,11 @@ static int snd_usb_pcm_prepare(snd_pcm_substream_t *substream) | |||
| 1439 | 1439 | ||
| 1440 | static snd_pcm_hardware_t snd_usb_playback = | 1440 | static snd_pcm_hardware_t snd_usb_playback = |
| 1441 | { | 1441 | { |
| 1442 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 1442 | .info = SNDRV_PCM_INFO_MMAP | |
| 1443 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 1443 | SNDRV_PCM_INFO_MMAP_VALID | |
| 1444 | SNDRV_PCM_INFO_MMAP_VALID), | 1444 | SNDRV_PCM_INFO_BATCH | |
| 1445 | SNDRV_PCM_INFO_INTERLEAVED | | ||
| 1446 | SNDRV_PCM_INFO_BLOCK_TRANSFER, | ||
| 1445 | .buffer_bytes_max = (256*1024), | 1447 | .buffer_bytes_max = (256*1024), |
| 1446 | .period_bytes_min = 64, | 1448 | .period_bytes_min = 64, |
| 1447 | .period_bytes_max = (128*1024), | 1449 | .period_bytes_max = (128*1024), |
| @@ -1451,9 +1453,11 @@ static snd_pcm_hardware_t snd_usb_playback = | |||
| 1451 | 1453 | ||
| 1452 | static snd_pcm_hardware_t snd_usb_capture = | 1454 | static snd_pcm_hardware_t snd_usb_capture = |
| 1453 | { | 1455 | { |
| 1454 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 1456 | .info = SNDRV_PCM_INFO_MMAP | |
| 1455 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 1457 | SNDRV_PCM_INFO_MMAP_VALID | |
| 1456 | SNDRV_PCM_INFO_MMAP_VALID), | 1458 | SNDRV_PCM_INFO_BATCH | |
| 1459 | SNDRV_PCM_INFO_INTERLEAVED | | ||
| 1460 | SNDRV_PCM_INFO_BLOCK_TRANSFER, | ||
| 1457 | .buffer_bytes_max = (256*1024), | 1461 | .buffer_bytes_max = (256*1024), |
| 1458 | .period_bytes_min = 64, | 1462 | .period_bytes_min = 64, |
| 1459 | .period_bytes_max = (128*1024), | 1463 | .period_bytes_max = (128*1024), |
| @@ -3132,7 +3136,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, | |||
| 3132 | return -ENOMEM; | 3136 | return -ENOMEM; |
| 3133 | } | 3137 | } |
| 3134 | 3138 | ||
| 3135 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 3139 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 3136 | if (! chip) { | 3140 | if (! chip) { |
| 3137 | snd_card_free(card); | 3141 | snd_card_free(card); |
| 3138 | return -ENOMEM; | 3142 | return -ENOMEM; |
