2021-06-03 14:28:59

by Yang Yingliang

Subject: [PATCH -next] ALSA: firewire-motu: fix error return code in snd_motu_stream_reserve_duplex()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: e50dfac81f73 ("ALSA: firewire-motu: cache event ticks in source packet header per data block")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
sound/firewire/motu/motu-stream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 43ff5be32b15..9e6ca39ebd7f 100644
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -191,7 +191,7 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
if (!motu->cache.event_offsets) {
fw_iso_resources_free(&motu->tx_resources);
fw_iso_resources_free(&motu->rx_resources);
- return err;
+ return -ENOMEM;
}
}

--
2.25.1

2021-06-03 15:05:01

by Takashi Sakamoto

Subject: Re: [PATCH -next] ALSA: firewire-motu: fix error return code in snd_motu_stream_reserve_duplex()

Hi,

On Thu, Jun 03, 2021 at 10:32:03PM +0800, Yang Yingliang wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: e50dfac81f73 ("ALSA: firewire-motu: cache event ticks in source packet header per data block")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> sound/firewire/motu/motu-stream.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
> index 43ff5be32b15..9e6ca39ebd7f 100644
> --- a/sound/firewire/motu/motu-stream.c
> +++ b/sound/firewire/motu/motu-stream.c
> @@ -191,7 +191,7 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
> if (!motu->cache.event_offsets) {
> fw_iso_resources_free(&motu->tx_resources);
> fw_iso_resources_free(&motu->rx_resources);
> - return err;
> + return -ENOMEM;
> }
> }
>
> --
> 2.25.1

Indeed. Nice to catch it.

Acked-by: Takashi Sakamoto <[email protected]>


Thanks

Takashi Sakamoto

2021-06-04 06:50:41

by Takashi Iwai

Subject: Re: [PATCH -next] ALSA: firewire-motu: fix error return code in snd_motu_stream_reserve_duplex()

On Thu, 03 Jun 2021 16:32:03 +0200,
Yang Yingliang wrote:
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: e50dfac81f73 ("ALSA: firewire-motu: cache event ticks in source packet header per data block")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>

Thanks, applied.


Takashi