Re: [patch] ALSA: asihpi - fix return type of hpios_locked_mem_alloc()

[Takashi Iwai <tiwai@xxxxxxx>]

At Wed, 28 Mar 2012 09:57:02 +0300,
Dan Carpenter wrote:
> 
> 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@xxxxxxxxxx>

Applied it now.  Thanks.


Takashi


> diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
> index 4cc315d..8c63200 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.
>  If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and
>  HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.
>  */
> -u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
> +int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
>  							   /**< memory handle */
>  	u32 size, /**< Size in bytes to allocate */
>  	struct pci_dev *p_os_reference
> diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c
> index 2d7d1c2..87f4385 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)
>  
>  On error, return -ENOMEM, and *pMemArea.size = 0
>  */
> -u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
> +int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
>  	struct pci_dev *pdev)
>  {
>  	/*?? any benefit in using managed dmam_alloc_coherent? */
> 
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html