diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-03-28 02:57:02 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-28 12:49:49 -0400 |
commit | a938fb1ef600c885f80e59b840a60894d16efb77 (patch) | |
tree | 9e727e867b6dbd13b15a6491e16a7951e778df2c /sound | |
parent | 26acaf08556a3c64ebf8ea3654b51e6acbb0a26c (diff) |
ALSA: asihpi - fix return type of hpios_locked_mem_alloc()
This function returns zero or -ENOMEM, but because it's type is u16, the
-ENOMEM gets changed to 65524. None of the callers care, but lets fix
it anyway as a cleanup.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/asihpi/hpi_internal.h | 2 | ||||
-rw-r--r-- | sound/pci/asihpi/hpios.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h index 4cc315daeda0..8c63200cf339 100644 --- a/sound/pci/asihpi/hpi_internal.h +++ b/sound/pci/asihpi/hpi_internal.h | |||
@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. | |||
42 | If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and | 42 | If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and |
43 | HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle. | 43 | HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle. |
44 | */ | 44 | */ |
45 | u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, | 45 | int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, |
46 | /**< memory handle */ | 46 | /**< memory handle */ |
47 | u32 size, /**< Size in bytes to allocate */ | 47 | u32 size, /**< Size in bytes to allocate */ |
48 | struct pci_dev *p_os_reference | 48 | struct pci_dev *p_os_reference |
diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c index 2d7d1c2e1d0d..87f4385fe8c7 100644 --- a/sound/pci/asihpi/hpios.c +++ b/sound/pci/asihpi/hpios.c | |||
@@ -43,7 +43,7 @@ void hpios_delay_micro_seconds(u32 num_micro_sec) | |||
43 | 43 | ||
44 | On error, return -ENOMEM, and *pMemArea.size = 0 | 44 | On error, return -ENOMEM, and *pMemArea.size = 0 |
45 | */ | 45 | */ |
46 | u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, | 46 | int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, |
47 | struct pci_dev *pdev) | 47 | struct pci_dev *pdev) |
48 | { | 48 | { |
49 | /*?? any benefit in using managed dmam_alloc_coherent? */ | 49 | /*?? any benefit in using managed dmam_alloc_coherent? */ |