summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-05-30 13:55:34 +0200
committerTakashi Iwai <tiwai@suse.de>2013-05-31 08:19:12 +0200
commit8b1dacb6ae15c94d50642a474e5af8981555253b (patch)
treef12300b0734aded5d980487f93127bc30d162eca
parentMerge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff)
downloadlinux-8b1dacb6ae15c94d50642a474e5af8981555253b.tar.xz
linux-8b1dacb6ae15c94d50642a474e5af8981555253b.zip
ALSA: sis7019: fix error return code in sis_chip_create()
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/sis7019.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index d59abe1682c5..748e82d4d257 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;
}