From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] ALSA: sis7019: fix error return code in sis_chip_create() Date: Fri, 31 May 2013 08:19:23 +0200 Message-ID: References: Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Wei Yongjun 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 List-Id: alsa-devel@alsa-project.org At Thu, 30 May 2013 19:55:34 +0800, Wei Yongjun wrote: > > From: Wei Yongjun > > 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 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; > } >