diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
| commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
| tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /sound/core | |
| parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
| parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/memalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 16bd9c03679b..691569238435 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
| @@ -176,7 +176,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, | |||
| 176 | * Calls the memory-allocator function for the corresponding | 176 | * Calls the memory-allocator function for the corresponding |
| 177 | * buffer type. | 177 | * buffer type. |
| 178 | * | 178 | * |
| 179 | * Returns zero if the buffer with the given size is allocated successfuly, | 179 | * Returns zero if the buffer with the given size is allocated successfully, |
| 180 | * other a negative value at error. | 180 | * other a negative value at error. |
| 181 | */ | 181 | */ |
| 182 | int snd_dma_alloc_pages(int type, struct device *device, size_t size, | 182 | int snd_dma_alloc_pages(int type, struct device *device, size_t size, |
| @@ -230,7 +230,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, | |||
| 230 | * tries to allocate again. The size actually allocated is stored in | 230 | * tries to allocate again. The size actually allocated is stored in |
| 231 | * res_size argument. | 231 | * res_size argument. |
| 232 | * | 232 | * |
| 233 | * Returns zero if the buffer with the given size is allocated successfuly, | 233 | * Returns zero if the buffer with the given size is allocated successfully, |
| 234 | * other a negative value at error. | 234 | * other a negative value at error. |
| 235 | */ | 235 | */ |
| 236 | int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, | 236 | int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, |