Commit 92fd918c authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai

ALSA: asihpi - fix return value of hpios_locked_mem_alloc()

Make this function consistent with others in this module by
returning 1 for error, instead of -ENOMEM
(reverts function signature change from a938fb1e)
Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c578ae00
/****************************************************************************** /******************************************************************************
AudioScience HPI driver AudioScience HPI driver
Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com> Copyright (C) 1997-2012 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as it under the terms of version 2 of the GNU General Public License as
...@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. ...@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned.
If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and
HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle. HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.
*/ */
int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
/**< memory handle */ /**< memory handle */
u32 size, /**< Size in bytes to allocate */ u32 size, /**< Size in bytes to allocate */
struct pci_dev *p_os_reference struct pci_dev *p_os_reference
......
/****************************************************************************** /******************************************************************************
AudioScience HPI driver AudioScience HPI driver
Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com> Copyright (C) 1997-2012 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as it under the terms of version 2 of the GNU General Public License as
...@@ -39,11 +39,11 @@ void hpios_delay_micro_seconds(u32 num_micro_sec) ...@@ -39,11 +39,11 @@ void hpios_delay_micro_seconds(u32 num_micro_sec)
} }
/** Allocated an area of locked memory for bus master DMA operations. /** Allocate an area of locked memory for bus master DMA operations.
On error, return -ENOMEM, and *pMemArea.size = 0 If allocation fails, return 1, and *pMemArea.size = 0
*/ */
int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
struct pci_dev *pdev) struct pci_dev *pdev)
{ {
/*?? any benefit in using managed dmam_alloc_coherent? */ /*?? any benefit in using managed dmam_alloc_coherent? */
...@@ -62,7 +62,7 @@ int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, ...@@ -62,7 +62,7 @@ int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
HPI_DEBUG_LOG(WARNING, HPI_DEBUG_LOG(WARNING,
"failed to allocate %d bytes locked memory\n", size); "failed to allocate %d bytes locked memory\n", size);
p_mem_area->size = 0; p_mem_area->size = 0;
return -ENOMEM; return 1;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment