diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
| commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
| tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /sound/core/pcm_dmaengine.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/pcm_dmaengine.c')
| -rw-r--r-- | sound/core/pcm_dmaengine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 6542c4083594..fba365a78390 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c | |||
| @@ -289,7 +289,7 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel); | |||
| 289 | * | 289 | * |
| 290 | * The function should usually be called from the pcm open callback. Note that | 290 | * The function should usually be called from the pcm open callback. Note that |
| 291 | * this function will use private_data field of the substream's runtime. So it | 291 | * this function will use private_data field of the substream's runtime. So it |
| 292 | * is not availabe to your pcm driver implementation. | 292 | * is not available to your pcm driver implementation. |
| 293 | */ | 293 | */ |
| 294 | int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, | 294 | int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, |
| 295 | struct dma_chan *chan) | 295 | struct dma_chan *chan) |
| @@ -328,7 +328,7 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open); | |||
| 328 | * This function will request a DMA channel using the passed filter function and | 328 | * This function will request a DMA channel using the passed filter function and |
| 329 | * data. The function should usually be called from the pcm open callback. Note | 329 | * data. The function should usually be called from the pcm open callback. Note |
| 330 | * that this function will use private_data field of the substream's runtime. So | 330 | * that this function will use private_data field of the substream's runtime. So |
| 331 | * it is not availabe to your pcm driver implementation. | 331 | * it is not available to your pcm driver implementation. |
| 332 | */ | 332 | */ |
| 333 | int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, | 333 | int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, |
| 334 | dma_filter_fn filter_fn, void *filter_data) | 334 | dma_filter_fn filter_fn, void *filter_data) |