Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Wei Yongjun <weiyj.lk@gmail.com>
Cc: perex@perex.cz, wfp5p@virginia.edu, adam.buchbinder@gmail.com,
	jkosina@suse.cz, Julia.Lawall@lip6.fr,
	yongjun_wei@trendmicro.com.cn, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ALSA: sis7019: fix error return code in sis_chip_create()
Date: Fri, 31 May 2013 08:19:23 +0200	[thread overview]
Message-ID: <s5htxljisd0.wl%tiwai@suse.de> (raw)
In-Reply-To: <CAPgLHd_QmY-8YEh8_kVGLGYq+mwYrXfjjYjtzn-tx5tmf87Ztg@mail.gmail.com>

At Thu, 30 May 2013 19:55:34 +0800,
Wei Yongjun wrote:
> 
> From: Wei Yongjun <yongjun_wei@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_wei@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;
>  	}
> 

      reply	other threads:[~2013-05-31  6:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-30 11:55 [PATCH] ALSA: sis7019: fix error return code in sis_chip_create() Wei Yongjun
2013-05-31  6:19 ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5htxljisd0.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=Julia.Lawall@lip6.fr \
    --cc=adam.buchbinder@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=weiyj.lk@gmail.com \
    --cc=wfp5p@virginia.edu \
    --cc=yongjun_wei@trendmicro.com.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox