* [PATCH] ALSA: sis7019: fix error return code in sis_chip_create()
@ 2013-05-30 11:55 Wei Yongjun
2013-05-31 6:19 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-05-30 11:55 UTC (permalink / raw)
To: perex, tiwai, wfp5p, adam.buchbinder, jkosina, Julia.Lawall
Cc: yongjun_wei, alsa-devel, linux-kernel
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>
---
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: sis7019: fix error return code in sis_chip_create()
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
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2013-05-31 6:19 UTC (permalink / raw)
To: Wei Yongjun
Cc: perex, wfp5p, adam.buchbinder, jkosina, Julia.Lawall, yongjun_wei,
alsa-devel, linux-kernel
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;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-31 6:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox