At Thu, 30 May 2013 19:55:34 +0800,
Wei Yongjun wrote:
> 
> From: Wei Yongjun <yongjun_...@trendmicro.com.cn>
> 
> Fix to return a negative error code in the pci_set_dma_mask() error
> handling case instead of 0, as done elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn>

Thanks, applied.


Takashi

> ---
>  sound/pci/sis7019.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
> index f2639a0..e413b4e 100644
> --- a/sound/pci/sis7019.c
> +++ b/sound/pci/sis7019.c
> @@ -1341,7 +1341,8 @@ static int sis_chip_create(struct snd_card *card,
>       if (rc)
>               goto error_out;
>  
> -     if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
> +     rc = pci_set_dma_mask(pci, DMA_BIT_MASK(30));
> +     if (rc < 0) {
>               dev_err(&pci->dev, "architecture does not support 30-bit PCI 
> busmaster DMA");
>               goto error_out_enabled;
>       }
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to